[gnome-games] gnome-sudoku: Style cleanup in game_selector.py

[Zhang Sen <zhangsen src gnome org>]

commit 543a0d8d1440bc277dc6d9563ee9db19cb3e69b7
Author: Zhang Sen <zh jesse gmail com>
Date:   Wed May 13 20:42:08 2009 +0800

    gnome-sudoku: Style cleanup in game_selector.py
    
     Nothing but adding spaces and newlines. Part of bug 578903.
---
 gnome-sudoku/src/lib/game_selector.py |   95 ++++++++++++++++++--------------
 1 files changed, 53 insertions(+), 42 deletions(-)

diff --git a/gnome-sudoku/src/lib/game_selector.py b/gnome-sudoku/src/lib/game_selector.py
index 722a803..a5ecb95 100644
--- a/gnome-sudoku/src/lib/game_selector.py
+++ b/gnome-sudoku/src/lib/game_selector.py
@@ -4,7 +4,7 @@ import os.path
 import sudoku, saver, sudoku_maker
 import sudoku_thumber
 from gettext import gettext as _
-from timer import format_time,format_friendly_date
+from timer import format_time, format_friendly_date
 import defaults
 from simple_debug import simple_debug
 from colors import color_hex_to_float
@@ -13,27 +13,36 @@ from gtk_goodies import gconf_wrapper
 def color_from_difficulty (diff):
     DR = sudoku.DifficultyRating
     if diff < DR.easy_range[1]:
-        if diff < DR.easy_range[1]/3: c='#8ae234' # green
-        elif diff < 2*DR.easy_range[1]/3: c='#73d216'
-        else: c='#4e9a06'
+        if diff < DR.easy_range[1] / 3:
+            c = '#8ae234' # green
+        elif diff < 2 * DR.easy_range[1] / 3:
+            c = '#73d216'
+        else:
+            c = '#4e9a06'
     elif diff < DR.medium_range[1]:
         span = DR.medium_range[1] - DR.easy_range[1]
-        if diff < DR.medium_range[0]+(span/3): c='#204a87' # sky blue
-        elif diff < DR.medium_range[0]+(2*(span/3)): c='#3465a4'
-        else: c='#729fcf'
+        if diff < DR.medium_range[0] + (span / 3):
+            c = '#204a87' # sky blue
+        elif diff < DR.medium_range[0] + (2 * (span / 3)):
+            c = '#3465a4'
+        else:
+            c = '#729fcf'
     elif diff < DR.hard_range[1]:
         span = DR.hard_range[1] - DR.medium_range[1]
-        if diff < DR.hard_range[0] + span/3: c='#fcaf3e' # orange
-        elif diff < DR.hard_range[0] + span*2/3: c='#f57900'
-        else: c='#ce5c00'
+        if diff < DR.hard_range[0] + span / 3:
+            c = '#fcaf3e' # orange
+        elif diff < DR.hard_range[0] + span * 2 / 3:
+            c = '#f57900'
+        else:
+            c = '#ce5c00'
     else:
         span = DR.very_hard_range[1] - DR.hard_range[1]
-        if diff < DR.very_hard_range[0] + span/3:
-            c='#ef2929' # scarlet red
-        elif diff < DR.very_hard_range[0]+ span*2/3:
-            c='#cc0000'
+        if diff < DR.very_hard_range[0] + span / 3:
+            c = '#ef2929' # scarlet red
+        elif diff < DR.very_hard_range[0]+ span * 2 / 3:
+            c = '#cc0000'
         else:
-            c='#a40000'
+            c = '#a40000'
     return color_hex_to_float(c)
 
 class NewOrSavedGameSelector (gconf_wrapper.GConfWrapper):
@@ -44,9 +53,9 @@ class NewOrSavedGameSelector (gconf_wrapper.GConfWrapper):
     ui_file = os.path.join(defaults.UI_DIR, 'select_game.ui')
 
     @simple_debug
-    def __init__ (self, sudokuMaker=None, gconf = None):
+    def __init__ (self, sudokuMaker = None, gconf = None):
         if gconf:
-            gconf_wrapper.GConfWrapper.__init__(self,gconf)
+            gconf_wrapper.GConfWrapper.__init__(self, gconf)
         self.sudoku_maker = sudokuMaker or sudoku_maker.SudokuMaker()
 
     def setup_dialog (self):
@@ -54,7 +63,7 @@ class NewOrSavedGameSelector (gconf_wrapper.GConfWrapper):
         self.builder.add_from_file(self.ui_file)
         self.dialog = self.builder.get_object('dialog1')
         self.dialog.set_default_response(gtk.RESPONSE_CANCEL)
-        self.dialog.connect('close',self.close)
+        self.dialog.connect('close', self.close)
         self.dialog.hide()
         self.saved_game_view = self.builder.get_object('savedGameIconView')
         self.saved_game_widgets = [
@@ -74,10 +83,11 @@ class NewOrSavedGameSelector (gconf_wrapper.GConfWrapper):
         self.new_game_view.set_markup_column(0)
         self.new_game_view.set_pixbuf_column(1)
         self.make_saved_game_model()
-        if len(self.saved_game_model)==0:
-            for w in self.saved_game_widgets: w.hide()
+        if len(self.saved_game_model) == 0:
+            for w in self.saved_game_widgets:
+                w.hide()
         else:
-            self.saved_game_model.set_sort_column_id(2,gtk.SORT_DESCENDING)
+            self.saved_game_model.set_sort_column_id(2, gtk.SORT_DESCENDING)
             self.saved_game_view.set_model(self.saved_game_model)
             self.saved_game_view.set_markup_column(0)
             self.saved_game_view.set_pixbuf_column(1)
@@ -86,37 +96,38 @@ class NewOrSavedGameSelector (gconf_wrapper.GConfWrapper):
             view.set_columns(4)
             view.set_spacing(12)
             view.set_selection_mode(gtk.SELECTION_SINGLE)
-        self.saved_game_view.connect('item-activated',self.saved_item_activated_cb)
-        self.new_game_view.connect('item-activated',self.new_item_activated_cb)
+        self.saved_game_view.connect('item-activated', self.saved_item_activated_cb)
+        self.new_game_view.connect('item-activated', self.new_item_activated_cb)
 
     @simple_debug
     def make_new_game_model (self):
         # Description, Pixbuf, Puzzle (str)
-        self.new_game_model = gtk.ListStore(str,gtk.gdk.Pixbuf,str)
+        self.new_game_model = gtk.ListStore(str, gtk.gdk.Pixbuf, str)
         saved_games_to_exclude = [
             g['game'].split('\n')[0] for g in self.saved_games
             ]
         for cat in sudoku.DifficultyRating.ordered_categories:
             label = sudoku.DifficultyRating.label_by_cat[cat]
-            puzzles = self.sudoku_maker.get_puzzles(1,[cat],new=True,
-                                                    exclude=saved_games_to_exclude
+            puzzles = self.sudoku_maker.get_puzzles(1, [cat], new = True,
+                                                    exclude = saved_games_to_exclude
                                                     )
             if puzzles:
-                puzzle,diff_val = puzzles[0]
+                puzzle, diff_val = puzzles[0]
             else:
                 print 'WARNING: Repeating puzzle for difficulty %s -- generate more puzzles to avoid this.'%cat
-                puzzles = self.sudoku_maker.get_puzzles(1,[cat],new=False)
+                puzzles = self.sudoku_maker.get_puzzles(1, [cat], new = False)
                 if puzzles:
-                    puzzle,diff_val = puzzles[0]
+                    puzzle, diff_val = puzzles[0]
                     lpuz = list(puzzle)
                     lpuz.reverse() # we reverse the puzzle so it at least looks different :-)
                     puzzle = ''
-                    for n in lpuz: puzzle += n
+                    for n in lpuz:
+                        puzzle += n
                 else:
-                    print 'WARNING: No puzzle for difficulty',cat
+                    print 'WARNING: No puzzle for difficulty', cat
                     continue
             grid = sudoku.sudoku_grid_from_string(puzzle).grid
-            self.new_game_model.append(('<b><i>'+label+'</i></b>',
+            self.new_game_model.append(('<b><i>' + label + '</i></b>',
                                         sudoku_thumber.make_pixbuf(grid,
                                                                    None,
                                                                    color_from_difficulty(diff_val)
@@ -127,17 +138,17 @@ class NewOrSavedGameSelector (gconf_wrapper.GConfWrapper):
     @simple_debug
     def make_saved_game_model (self):
         # Description, Image, Last-Access time (for sorting), Puzzle (jar)
-        self.saved_game_model = gtk.ListStore(str,gtk.gdk.Pixbuf,int,gobject.TYPE_PYOBJECT)
+        self.saved_game_model = gtk.ListStore(str, gtk.gdk.Pixbuf, int, gobject.TYPE_PYOBJECT)
         for g in self.saved_games:
             game = g['game'].split('\n')[0]
             grid = sudoku.sudoku_grid_from_string(game)
             sr = sudoku.SudokuRater(grid.grid)
             sdifficulty = sr.difficulty()
             lastPlayedText = _("Last Played %(timeAgo)s") % {'timeAgo': format_friendly_date(g['saved_at'])}
-            levelText =  _("%(level)s puzzle")% {'level': sdifficulty.value_string()}
+            levelText =  _("%(level)s puzzle") % {'level': sdifficulty.value_string()}
             durationText = _("Played for %(duration)s") % {
-                    'duration': format_time(g['timer.active_time'],round_at=15,friendly=True)}
-            desc = "<b><i>%s</i></b>\n<span size='small'><i>%s</i>\n<i>%s.</i></span>"%(
+                    'duration': format_time(g['timer.active_time'], round_at = 15, friendly = True)}
+            desc = "<b><i>%s</i></b>\n<span size='small'><i>%s</i>\n<i>%s.</i></span>" % (
                 levelText,
                 lastPlayedText,
                 durationText,
@@ -145,7 +156,7 @@ class NewOrSavedGameSelector (gconf_wrapper.GConfWrapper):
             self.saved_game_model.append((
                 desc,
                 sudoku_thumber.make_pixbuf(grid.grid,
-                                           sudoku.sudoku_grid_from_string(g['game'].split('\n')[1].replace(' ','')).grid,
+                                           sudoku.sudoku_grid_from_string(g['game'].split('\n')[1].replace(' ', '')).grid,
                                            color_from_difficulty(sdifficulty.value)
                                            ),
                 g['saved_at'],
@@ -163,20 +174,20 @@ class NewOrSavedGameSelector (gconf_wrapper.GConfWrapper):
     @simple_debug
     def resume_game (self, jar):
         self.puzzle = (self.SAVED_GAME, jar)
-        self.dialog.emit('response',gtk.RESPONSE_OK)
+        self.dialog.emit('response', gtk.RESPONSE_OK)
 
     @simple_debug
     def play_game (self, puzzle):
-        self.puzzle = (self.NEW_GAME,puzzle)
-        self.dialog.emit('response',gtk.RESPONSE_OK)
+        self.puzzle = (self.NEW_GAME, puzzle)
+        self.dialog.emit('response', gtk.RESPONSE_OK)
 
     @simple_debug
     def close (self):
-        self.dialog.emit('response',gtk.RESPONSE_CLOSE)
+        self.dialog.emit('response', gtk.RESPONSE_CLOSE)
 
     @simple_debug
     def handle_response (self, response):
-        if response==gtk.RESPONSE_OK:
+        if response == gtk.RESPONSE_OK:
             return self.puzzle
         else:
             return None