pep8 cleanup

7 files changed, 54 insertions, 42 deletions

diff --git a/PathsActivity.py b/PathsActivity.py
index f938f5c..bfc788e 100644
--- a/PathsActivity.py
+++ b/PathsActivity.py
@@ -109,18 +109,19 @@ def _image_factory(image, toolbar, tooltip=None):
     img_tool.show()
     return img
 
+
 class PathsActivity(activity.Activity):
     """ Path puzzle game """
 
     def __init__(self, handle):
         """ Initialize the toolbars and the game board """
-        super(PathsActivity,self).__init__(handle)
+        super(PathsActivity, self).__init__(handle)
         self.nick = profile.get_nick_name()
         if profile.get_color() is not None:
             self.colors = profile.get_color().to_string().split(',')
         else:
             self.colors = ['#A0FFA0', '#FF8080']
-        
+
         self._setup_toolbars(_have_toolbox)
         self._setup_dispatch_table()
 
@@ -136,6 +137,8 @@ class PathsActivity(activity.Activity):
         self._setup_presence_service()
 
         # Restore game state from Journal or start new game
+        # TODO: Sort out restore issues for sharer;
+        #       Sort out init issues for joiner.
         if 'deck' in self.metadata:
             self._restore()
         elif not hasattr(self, 'initiating'):
@@ -144,8 +147,6 @@ class PathsActivity(activity.Activity):
             self._game.new_game()
         elif len(self._game.buddies) == 1:
             self._game.new_game()
-        else:
-            print 'I am confused'
 
     def _setup_toolbars(self, have_toolbox):
         """ Setup the toolbars. """
@@ -175,13 +176,13 @@ class PathsActivity(activity.Activity):
             toolbox.set_current_toolbar(1)
             self.toolbar = games_toolbar
 
-        self._new_game_button = _button_factory('new-game',
-                                                _('Start a new game.'),
-                                                self._new_game_cb, self.toolbar)
+        self._new_game_button = _button_factory(
+            'new-game', _('Start a new game.'), self._new_game_cb,
+            self.toolbar)
 
-        self.robot_button = _button_factory('robot-off',
-                                             _('Play with the computer.'),
-                                             self._robot_cb, self.toolbar)
+        self.robot_button = _button_factory(
+            'robot-off', _('Play with the computer.'), self._robot_cb,
+            self.toolbar)
 
         self.player = _image_factory(
             svg_str_to_pixbuf(generate_xo(scale=0.8,
@@ -331,8 +332,8 @@ class PathsActivity(activity.Activity):
         self.tubes_chan = self._shared_activity.telepathy_tubes_chan
         self.text_chan = self._shared_activity.telepathy_text_chan
 
-        self.tubes_chan[telepathy.CHANNEL_TYPE_TUBES].connect_to_signal\
-            ('NewTube', self._new_tube_cb)
+        self.tubes_chan[telepathy.CHANNEL_TYPE_TUBES].connect_to_signal(
+            'NewTube', self._new_tube_cb)
 
         if sharer:
             print('This is my activity: making a tube...')
@@ -472,15 +473,14 @@ state=%d' % (id, initiator, type, service, params, state))
                 self._game.whos_turn = 0
             self.status.set_label(self.nick + ': ' + _('take a turn.'))
             self._take_a_turn(self._game.buddies[self._game.whos_turn])
-            self.send_event('t|%s' % (self._game.buddies[self._game.whos_turn]))
+            self.send_event('t|%s' % (
+                    self._game.buddies[self._game.whos_turn]))
 
     def _take_a_turn(self, nick):
         ''' If it is your turn, take it, otherwise, wait. '''
         if nick == self.nick:
-            print "it's my turn"
             self._game.its_my_turn()
         else:
-            print "it's %s's turn" % (nick)
             self._game.its_their_turn(nick)
 
     def send_event(self, entry):
@@ -493,6 +493,7 @@ state=%d' % (id, initiator, type, service, params, state))
                 self._game.buddies.index(nick)])
         self.player.set_tooltip_text(nick)
 
+
 class ChatTube(ExportedGObject):
     """ Class for setting up tube for sharing """
 
diff --git a/card.py b/card.py
index 2c5665c..3ecc285 100644
--- a/card.py
+++ b/card.py
@@ -15,6 +15,7 @@ from constants import NORTH, EAST, SOUTH, WEST, HIDE, CARDS
 from sprites import Sprite
 from utils import svg_str_to_pixbuf
 
+
 class Card:
 
     def __init__(self, sprites, svg, svgs, card_type='tile', number=0):
@@ -72,7 +73,7 @@ class Card:
         self.spr.draw()
 
     def hide(self):
-        self.spr.move((-self.spr.images[0].get_width(),0))
+        self.spr.move((-self.spr.images[0].get_width(), 0))
 
 
 #
diff --git a/deck.py b/deck.py
index 4f5b320..652f6dd 100644
--- a/deck.py
+++ b/deck.py
@@ -98,7 +98,7 @@ class Deck:
         # Randomize the card order.
         for n in range(decksize):
             i = randrange(decksize - n)
-            self.swap_cards(n, decksize - 1 - i)            
+            self.swap_cards(n, decksize - 1 - i)
         # Reset the index to the beginning of the deck after a shuffle,
         self.index = 0
         self.hide()
@@ -136,7 +136,7 @@ class Deck:
         for card in self.cards:
             card.reset()
 
-    def swap_cards(self,i,j):
+    def swap_cards(self, i, j):
         ''' Swap the position of two cards in the deck. '''
         tmp = self.cards[j]
         self.cards[j] = self.cards[i]
@@ -164,7 +164,7 @@ class Deck:
         next_card = self.cards[self.index]
         self.index += 1
         return next_card
- 
+
     def empty(self):
         ''' Is the deck empty? '''
         if self.cards_remaining() > 0:
@@ -174,7 +174,7 @@ class Deck:
 
     def cards_remaining(self):
         ''' Return how many cards are remaining in the deck. '''
-        return(self.count()-self.index)
+        return(self.count() - self.index)
 
     def hide(self):
         ''' Hide the deck. '''
diff --git a/game.py b/game.py
index a0e565e..a81d6b5 100644
--- a/game.py
+++ b/game.py
@@ -176,7 +176,8 @@ class Game():
             self._activity.status.set_label(string)
             self._activity.score.set_label(_('Score: ') + str(self.score))
         elif hasattr(self, 'win'):
-            self.win.set_title('%s: %s [%d]' % (_('Paths'), string, self.score))
+            self.win.set_title('%s: %s [%d]' % (_('Paths'), string,
+                                                self.score))
 
     def its_my_turn(self):
         # I need to play a piece...
@@ -204,7 +205,7 @@ class Game():
                     self._activity.dialog_button.set_icon('dialog-cancel')
                     self._activity.dialog_button.set_tooltip(_('Game over'))
                 self._set_label(_('Game over'))
-                
+
         elif self._initiating():
             if self.deck.empty():
                 self._set_label(_('Game over'))
@@ -356,7 +357,7 @@ class Game():
                 i = self.grid.spr_to_grid(self._press)
                 if i is not None:
                     self.grid.grid[i] = None
-                
+
                 self.grid.grid[grid_pos] = card
                 self.placed_a_tile = True
                 self._last_tile_played = card.number
@@ -371,7 +372,7 @@ class Game():
                 self._show_highlight()
         elif hand_pos is not None:  # Returning tile to hand
             i = self.hands[self._my_hand].find_empty_slot()
-            if i is not None: 
+            if i is not None:
                 card = self.deck.spr_to_card(self._press)
                 card.spr.move(self.hands[self._my_hand].hand_to_xy(i))
                 if self.hands[self._my_hand].spr_to_hand(
@@ -389,7 +390,7 @@ class Game():
                 self.show_connected_tiles()
             else:  # Or return tile to the grid
                 grid_pos = self.grid.spr_to_grid(self._press)
-                if grid_pos is not None: 
+                if grid_pos is not None:
                     card = self.deck.spr_to_card(self._press)
                     card.spr.move(self.grid.grid_to_xy(grid_pos))
             self._hide_highlight()
@@ -409,7 +410,7 @@ class Game():
 
         if hand_pos is None and x < self.grid.left:  # In limbo: return to grid
             grid_pos = self.grid.spr_to_grid(self._press)
-            if grid_pos is not None: 
+            if grid_pos is not None:
                 card = self.deck.spr_to_card(self._press)
                 card.spr.move(self.grid.grid_to_xy(grid_pos))
                 self._hide_highlight()
@@ -584,7 +585,7 @@ class Game():
                     return False
                 else:
                     return True
-            if self.grid.grid[neighbor].paths[0][(direction + 2) % 4] == 0 and \
+            if self.grid.grid[neighbor].paths[0][(direction + 2) % 4] == 0 and\
                self.grid.grid[neighbor].paths[1][(direction + 2) % 4] == 0:
                 return False
         return True
diff --git a/genpieces.py b/genpieces.py
index 9cba133..0171602 100755
--- a/genpieces.py
+++ b/genpieces.py
@@ -15,10 +15,9 @@
 
 import os
 
-#
-# SVG generators
-#
+
 class SVG:
+    ''' SVG generators '''
     def __init__(self):
         self._scale = 1
         self._stroke_width = 1
@@ -94,7 +93,7 @@ class SVG:
                                   "\"\n")
         svg_string += "%s%f%s" % ("   height=\"", scale * 55 * self._scale,
                                   "\">\n")
-        svg_string += "%s%f%s%f%s" % ("<g\n       transform=\"matrix(", 
+        svg_string += "%s%f%s%f%s" % ("<g\n       transform=\"matrix(",
                                       self._scale, ",0,0,", self._scale,
                                       ",0,0)\">\n")
         if background:
@@ -135,6 +134,8 @@ class SVG:
 #
 # Card generators
 #
+
+
 def generate_xo(scale=1, colors=["#FFFFFF", "#000000"]):
     svg = SVG()
     svg.set_scale(scale)
@@ -144,6 +145,7 @@ def generate_xo(scale=1, colors=["#FFFFFF", "#000000"]):
     svg_string += svg.footer()
     return svg_string
 
+
 def generate_x(scale=1):
     svg = SVG()
     svg.set_scale(scale)
@@ -153,6 +155,7 @@ def generate_x(scale=1):
     svg_string += svg.footer()
     return svg_string
 
+
 def generate_corners(which_corner=0, scale=1):
     svg = SVG()
     svg.set_scale(scale)
@@ -162,6 +165,7 @@ def generate_corners(which_corner=0, scale=1):
     svg_string += svg.footer()
     return svg_string
 
+
 def generate_blank(scale=1, color='#A0FFA0'):
     svg = SVG()
     svg.set_scale(scale)
@@ -170,6 +174,7 @@ def generate_blank(scale=1, color='#A0FFA0'):
     svg_string += svg.footer()
     return svg_string
 
+
 def generate_board(scale=1, color='#000000'):
     svg = SVG()
     svg.set_scale(scale)
@@ -178,6 +183,7 @@ def generate_board(scale=1, color='#000000'):
     svg_string += svg.footer()
     return svg_string
 
+
 def generate_tile_1_line(a, b, c, d, scale=1, color='#000000'):
     svg = SVG()
     svg.set_scale(scale)
@@ -187,6 +193,7 @@ def generate_tile_1_line(a, b, c, d, scale=1, color='#000000'):
     svg_string += svg.footer()
     return svg_string
 
+
 def generate_tile_2_lines(a, b, c, d, e, f, g, h, scale=1,
                           colors=['#000000', '#000000']):
     svg = SVG()
@@ -202,19 +209,23 @@ def generate_tile_2_lines(a, b, c, d, e, f, g, h, scale=1,
 #
 # Command line utilities used for testing purposed only
 #
+
+
 def open_file(datapath, filename):
     return file(os.path.join(datapath, filename), "w")
 
+
 def close_file(f):
     f.close()
 
+
 def generator(datapath):
-    """
     i = 0
     filename = "tile-%d.svg" % (i)
     f = open_file(datapath, filename)
     f.write(generate_tile_1_line(-1, 0, 0, 0))
     close_file(f)
+    """
     i += 1
     filename = "tile-%d.svg" % (i)
     f = open_file(datapath, filename)
@@ -257,10 +268,11 @@ def generator(datapath):
     f = open_file(datapath, 'board.svg')
     f.write(generate_board())
     close_file(f)
-    """
     f = open_file(datapath, 'xo.svg')
     f.write(generate_xo())
     close_file(f)
+    """
+
 
 def main():
     return 0
diff --git a/grid.py b/grid.py
index 7999a22..93e1841 100644
--- a/grid.py
+++ b/grid.py
@@ -70,12 +70,12 @@ class Grid:
             else:
                 for k in range(ROW * COL):
                     if deck.cards[k].number == grid[i][0]:
-                        self.add_card_to_grid(k, grid[i][1], i, deck) 
+                        self.add_card_to_grid(k, grid[i][1], i, deck)
                         break
         self.show()
 
     def add_card_to_grid(self, card_number, orientation, grid_number, deck):
-        ''' Add cards[card_number] to grid[grid_number] at orientation ''' 
+        ''' Add cards[card_number] to grid[grid_number] at orientation '''
         self.grid[grid_number] = deck.cards[card_number]
         self.grid[grid_number].spr.move(self.grid_to_xy(grid_number))
         self.grid[grid_number].spr.set_layer(CARDS)
@@ -122,6 +122,5 @@ class Grid:
     def show(self):
         ''' Restore all card on the grid to their x,y positions. '''
         for i in range(ROW * COL):
-            self.place_a_card(self.grid[i],self.grid_to_xy(i)[0],
+            self.place_a_card(self.grid[i], self.grid_to_xy(i)[0],
                               self.grid_to_xy(i)[1])
-  
diff --git a/hand.py b/hand.py
index bfe63f3..af5f3bc 100644
--- a/hand.py
+++ b/hand.py
@@ -23,14 +23,14 @@ class Hand:
     ''' Class for managing COL matrix of cards '''
 
     def __init__(self, card_width, card_height, remote=False):
-        # the tiles in your hand        
+        # The tiles in your hand
         self.hand = []
         self.remote = remote  # Does this hand belong to someone remote?
 
         for i in range(COL):
             self.hand.append(None)
 
-        # card spacing
+        # Card spacing
         self.xinc = int(card_width)
         if self.remote:
             self.left = -self.xinc
@@ -50,8 +50,6 @@ class Hand:
             if self.hand[i] is not None:
                 self.hand[i].spr.move(self.hand_to_xy(i))
                 self.hand[i].spr.set_layer(CARDS)
-            else:
-                print 'No more cards in the deck.'
         return True
 
     def find_empty_slot(self):
@@ -71,7 +69,7 @@ class Hand:
             hand = []
         else:
             hand = [buddy]
-        for i in range( COL):
+        for i in range(COL):
             if self.hand[i] is not None:
                 hand.append(self.hand[i].number)
             else: