[gnome-games] gnome-sudoku: Add spaces around operators



commit 86b62fda40e8413c0c622aa8cd82d26e25fe457f
Author: Zhang Sen <zh jesse gmail com>
Date:   Tue May 12 18:04:56 2009 +0800

    gnome-sudoku: Add spaces around operators
    
    Part of style cleanup in bug 578903.
---
 gnome-sudoku/src/lib/saver.py |  114 ++++++++++++++++++++--------------------
 1 files changed, 57 insertions(+), 57 deletions(-)

diff --git a/gnome-sudoku/src/lib/saver.py b/gnome-sudoku/src/lib/saver.py
index 2fc500e..e00b826 100644
--- a/gnome-sudoku/src/lib/saver.py
+++ b/gnome-sudoku/src/lib/saver.py
@@ -30,9 +30,9 @@ def update_saved_attributes (jar):
 
 def super_getattr (obj, attr):
     """getattr, following the dots."""
-    attrs=attr.split('.')
+    attrs = attr.split('.')
     for a in attrs:
-        obj = getattr(obj,a)
+        obj = getattr(obj, a)
     return obj
 
 def super_setattr (obj, attr, val):
@@ -42,22 +42,22 @@ def super_setattr (obj, attr, val):
         sub_attrs = attrs[0:-1]
         attr = attrs[-1]
         for a in sub_attrs:
-            obj = getattr(obj,a)
-    setattr(obj,attr,val)
+            obj = getattr(obj, a)
+    setattr(obj, attr, val)
 
 def jar_game (ui):
     jar = {} # what we will pickle
     ui.timer.finish_timing()
-    jar['game']=ui.gsd.grid.to_string()
-    jar['trackers']=ui.gsd.trackers
-    jar['tracking']=ui.gsd.__trackers_tracking__
-    jar['notes']=[]
+    jar['game'] = ui.gsd.grid.to_string()
+    jar['trackers'] = ui.gsd.trackers
+    jar['tracking'] = ui.gsd.__trackers_tracking__
+    jar['notes'] = []
     for e in ui.gsd.__entries__.values():
-        top,bot = e.get_note_text()
+        top, bot = e.get_note_text()
         if top or bot:
-            jar['notes'].append((e.x,e.y,top,bot))
+            jar['notes'].append((e.x, e.y, top, bot))
     for attr in SAVE_ATTRIBUTES:
-        jar[attr]=super_getattr(ui,attr)
+        jar[attr] = super_getattr(ui, attr)
     return jar
 
 def set_value_from_jar (dest, jar):
@@ -69,34 +69,34 @@ def open_game (ui, jar):
     # this is a bit easily breakable... we take advantage of the fact
     # that we create tracker IDs sequentially and that {}.items()
     # sorts by keys by default
-    for tracker,tracked in jar.get('trackers',{}).items():
+    for tracker, tracked in jar.get('trackers', {}).items():
         # add 1 tracker per existing tracker...
         ui.tracker_ui.add_tracker()
-        for x,y,val in tracked:
-            ui.gsd.add_tracker(x,y,tracker,val=val)
-    for tracker,tracking in jar.get('tracking',{}).items():
+        for x, y, val in tracked:
+            ui.gsd.add_tracker(x, y, tracker, val = val)
+    for tracker, tracking in jar.get('tracking', {}).items():
         if tracking:
             ui.tracker_ui.select_tracker(tracker)
     set_value_from_jar(ui, jar)
     if jar.has_key('notes') and jar['notes']:
-        for x,y,top,bot in jar['notes']:
-            ui.gsd.__entries__[(x,y)].set_note_text(top,bot)
+        for x, y, top, bot in jar['notes']:
+            ui.gsd.__entries__[(x, y)].set_note_text(top, bot)
 
 def pickle_game (ui, target):
     close_me = False
     if type(target) in types.StringTypes:
-        target = file(target,'w')
+        target = file(target, 'w')
         close_me = True
     to_dump = jar_game(ui)
-    pickle.dump(to_dump,target)
+    pickle.dump(to_dump, target)
     if close_me: target.close()
 
 def unpickle_game (ui, target):
     close_me = False
-    if type(target)==str:
+    if type(target) == str:
         target = file(target, 'r')
         close_me = True
-    open_game(ui,pickle.load(target))
+    open_game(ui, pickle.load(target))
     if close_me: target.close()
 
 class SudokuTracker:
@@ -117,16 +117,16 @@ class SudokuTracker:
             except OSError, e:
                 if e.errno == errno.ENOSPC:
                     show_message(
-                        title=_('No Space'),
-                        label=_('No space left on disk'),
-                        message_type=gtk.MESSAGE_ERROR,
+                        title = _('No Space'),
+                        label = _('No space left on disk'),
+                        message_type = gtk.MESSAGE_ERROR,
                         sublabel = _('Unable to create data folder %(path)s.') % locals() + '\n' + \
                                    _('There is no disk space left!')
                         )
                 else:
                     show_message(
-                        title='Error creating directory',
-                        label='Error creating directory',
+                        title = 'Error creating directory',
+                        label = 'Error creating directory',
                         sublabel = (_('Unable to create data folder %(path)s.') % locals() + '\n' +
                                     _('Error %(errno)s: %(error)s') % {
                                         'errno': e.errno,
@@ -137,23 +137,23 @@ class SudokuTracker:
         return ui.gsd.grid.virgin.to_string()
 
     def get_filename (self, gamestring):
-        return gamestring.split('\n')[0].replace(' ','')
+        return gamestring.split('\n')[0].replace(' ', '')
 
     def save_game (self, ui):
         jar = jar_game(ui)
-        filename = os.path.join(self.save_path,self.get_filename(jar['game']))
+        filename = os.path.join(self.save_path, self.get_filename(jar['game']))
         try:
-            outfi = file(filename,'w')
-            pickle.dump(jar,outfi)
+            outfi = file(filename, 'w')
+            pickle.dump(jar, outfi)
             outfi.close()
         except (OSError, IOError), e:
             show_message(
-                title=_('Sudoku unable to save game.'),
-                label=_('Sudoku unable to save game.'),
-                message_type=gtk.MESSAGE_ERROR,
-                sublabel=(_('Unable to save file %(filename)s.')%locals()
+                title = _('Sudoku unable to save game.'),
+                label = _('Sudoku unable to save game.'),
+                message_type = gtk.MESSAGE_ERROR,
+                sublabel = (_('Unable to save file %(filename)s.') % locals()
                           + '\n' +
-                          _('Error %(errno)s: %(error)s')%{
+                          _('Error %(errno)s: %(error)s') % {
                 'errno':e.errno,
                 'error':e.strerror
                 })
@@ -168,16 +168,16 @@ class SudokuTracker:
         try:
             filename = os.path.join(self.finished_path,
                                     self.get_filename(jar['game']))
-            outfi = file(filename,'w')
-            pickle.dump(jar,outfi)
+            outfi = file(filename, 'w')
+            pickle.dump(jar, outfi)
             outfi.close()
         except (OSError, IOError), e:
             show_message(
-                title=_('Sudoku unable to mark game as finished.'),
-                label=_('Sudoku unable to mark game as finished.'),
-                message_type=gtk.MESSAGE_ERROR,
-                sublabel=(_('Unable to save file %(filename)s.')%locals() + '\n' +
-                          _('Error %(errno)s: %(error)s')%{
+                title = _('Sudoku unable to mark game as finished.'),
+                label = _('Sudoku unable to mark game as finished.'),
+                message_type = gtk.MESSAGE_ERROR,
+                sublabel = (_('Unable to save file %(filename)s.') % locals() + '\n' +
+                          _('Error %(errno)s: %(error)s') % {
                 'errno':e.errno,
                 'error':e.strerror
                 })
@@ -186,16 +186,16 @@ class SudokuTracker:
             filename = list_of_finished_games = os.path.join(
                 os.path.join(defaults.DATA_DIR, 'puzzles'), 'finished'
                 )
-            ofi = open(list_of_finished_games,'a')
+            ofi = open(list_of_finished_games, 'a')
             ofi.write(jar['game'].split('\n')[0]+'\n')
             ofi.close()
         except (OSError, IOError), e:
             show_message(
-                title=_('Sudoku unable to mark game as finished.'),
-                label=_('Sudoku unable to mark game as finished.'),
-                message_type=gtk.MESSAGE_ERROR,
-                sublabel=(_('Unable to save file %(filename)s.')%locals() + '\n' +
-                          _('Error %(errno)s: %(error)s')%{
+                title = _('Sudoku unable to mark game as finished.'),
+                label = _('Sudoku unable to mark game as finished.'),
+                message_type = gtk.MESSAGE_ERROR,
+                sublabel = (_('Unable to save file %(filename)s.') % locals() + '\n' +
+                          _('Error %(errno)s: %(error)s') % {
                 'errno':e.errno,
                 'error':e.strerror
                 })
@@ -203,7 +203,7 @@ class SudokuTracker:
 
     def remove_from_saved_games (self, jar):
         previously_saved_game = os.path.join(
-            self.save_path,self.get_filename(jar['game'])
+            self.save_path, self.get_filename(jar['game'])
             )
         if os.path.exists(previously_saved_game):
             os.remove(os.path.join(previously_saved_game))
@@ -219,23 +219,23 @@ class SudokuTracker:
             files = []
         games = []
         for f in files:
-            f = os.path.join(self.save_path,f)
+            f = os.path.join(self.save_path, f)
             try:
-                jar = pickle.load(file(f,'r'))
+                jar = pickle.load(file(f, 'r'))
             except:
-                print 'Warning: could not read file',f
+                print 'Warning: could not read file', f
             else:
                 update_saved_attributes(jar)
                 if self.is_valid(jar):
-                    jar['saved_at']=os.stat(f)[8]
+                    jar['saved_at'] = os.stat(f)[8]
                     games.append(jar)
                 else:
-                    print 'Warning: malformed save game',f
+                    print 'Warning: malformed save game', f
         return games
 
     def is_valid (self, jar):
-        virgin = jar['game'].split('\n')[0].replace(' ','')
-        played = jar['game'].split('\n')[1].replace(' ','')
+        virgin = jar['game'].split('\n')[0].replace(' ', '')
+        played = jar['game'].split('\n')[1].replace(' ', '')
 
         if len(virgin) != 81 or len(played) != 81:
             return False
@@ -244,7 +244,7 @@ class SudokuTracker:
             return False
 
         for attr in SAVE_ATTRIBUTES:
-            if jar.get(attr,None) == None:
+            if jar.get(attr, None) == None:
                 return False
 
         return True



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]