[gnome-games/sudoku-tube] Remove simple_debug

[Zhang Sen <zhangsen src gnome org>]

commit ae24bfe63292a5ba737b22d29b09417d85cd6c6e
Author: Zhang Sen <zh jesse gmail com>
Date:   Sun Jun 21 22:41:47 2009 +0800

    Remove simple_debug
    
    it's not very helpful

 gnome-sudoku/src/lib/Makefile.am      |    1 -
 gnome-sudoku/src/lib/game_selector.py |   10 ------
 gnome-sudoku/src/lib/gsudoku.py       |   18 ----------
 gnome-sudoku/src/lib/main.py          |   56 +++++++++-----------------------
 gnome-sudoku/src/lib/simple_debug.py  |   45 --------------------------
 5 files changed, 16 insertions(+), 114 deletions(-)
---
diff --git a/gnome-sudoku/src/lib/Makefile.am b/gnome-sudoku/src/lib/Makefile.am
index 47578d0..38b7a7f 100644
--- a/gnome-sudoku/src/lib/Makefile.am
+++ b/gnome-sudoku/src/lib/Makefile.am
@@ -20,7 +20,6 @@ gnomesudoku_PYTHON = \
 	pausable.py	\
 	printing.py	\
 	saver.py	\
-	simple_debug.py	\
 	sudoku.py	\
 	sudoku_generator_gui.py	\
 	sudoku_maker.py	\
diff --git a/gnome-sudoku/src/lib/game_selector.py b/gnome-sudoku/src/lib/game_selector.py
index 6f6dd61..b382cc4 100644
--- a/gnome-sudoku/src/lib/game_selector.py
+++ b/gnome-sudoku/src/lib/game_selector.py
@@ -6,7 +6,6 @@ import sudoku_thumber
 from gettext import gettext as _
 from timer import format_time, format_friendly_date
 import defaults
-from simple_debug import simple_debug
 from colors import color_hex_to_float
 
 def color_from_difficulty (diff):
@@ -51,7 +50,6 @@ class NewOrSavedGameSelector ():
 
     ui_file = os.path.join(defaults.UI_DIR, 'select_game.ui')
 
-    @simple_debug
     def __init__ (self):
         self.sudoku_maker = sudoku_maker.SudokuMaker()
         self.dialog = None
@@ -101,7 +99,6 @@ class NewOrSavedGameSelector ():
         saved_game_view.connect('item-activated', self.saved_item_activated_cb)
         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)
@@ -137,7 +134,6 @@ class NewOrSavedGameSelector ():
                                         puzzle
                                         ))
 
-    @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)
@@ -165,29 +161,23 @@ class NewOrSavedGameSelector ():
                 g
                 ))
 
-    @simple_debug
     def new_item_activated_cb (self, iconview, path):
         self.play_game(iconview.get_model()[path][2])
 
-    @simple_debug
     def saved_item_activated_cb (self, iconview, path):
         self.resume_game(iconview.get_model()[path][3])
 
-    @simple_debug
     def resume_game (self, jar):
         self.puzzle = (self.SAVED_GAME, jar)
         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)
 
-    @simple_debug
     def close (self, *args):
         self.dialog.emit('response', gtk.RESPONSE_CLOSE)
 
-    @simple_debug
     def handle_response (self, response):
         if response == gtk.RESPONSE_OK:
             return self.puzzle
diff --git a/gnome-sudoku/src/lib/gsudoku.py b/gnome-sudoku/src/lib/gsudoku.py
index a05bb2e..2fe01b6 100644
--- a/gnome-sudoku/src/lib/gsudoku.py
+++ b/gnome-sudoku/src/lib/gsudoku.py
@@ -3,7 +3,6 @@ import gtk, gobject
 import colors
 import math
 import random
-from simple_debug import simple_debug
 import sudoku
 import number_box
 
@@ -147,7 +146,6 @@ class SudokuGameDisplay (SudokuNumberGrid, gobject.GObject):
 
     do_highlight_cells = False
 
-    @simple_debug
     def __init__ (self, grid = None, group_size = 9,
                   show_impossible_implications = False):
         group_size = int(group_size)
@@ -193,7 +191,6 @@ class SudokuGameDisplay (SudokuNumberGrid, gobject.GObject):
             return None
         return dest
 
-    @simple_debug
     def _focus_callback(self, e, event):
         self.focused = e
         self.emit('focus-changed')
@@ -257,7 +254,6 @@ class SudokuGameDisplay (SudokuNumberGrid, gobject.GObject):
                     e.set_background_color(self.box_color)
 
 
-    @simple_debug
     def show_hint (self):
         if self.focused:
             entry = self.focused
@@ -287,7 +283,6 @@ class SudokuGameDisplay (SudokuNumberGrid, gobject.GObject):
         else:
             set_method(bottom_text = "")
 
-    @simple_debug
     def reset_grid (self):
         """Reset grid to its original setup.
 
@@ -319,7 +314,6 @@ class SudokuGameDisplay (SudokuNumberGrid, gobject.GObject):
     def clear_hints (self):
         self.clear_notes(clear_args = {'bottom_text':''})
 
-    @simple_debug
     def _blank_grid(self):
         for x in range(self.group_size):
             for y in range(self.group_size):
@@ -330,7 +324,6 @@ class SudokuGameDisplay (SudokuNumberGrid, gobject.GObject):
         self.grid = None
         self.clear_notes()
 
-    @simple_debug
     def change_grid (self, grid, group_size):
         self.auto_fills = 0
         self.hints = 0
@@ -340,7 +333,6 @@ class SudokuGameDisplay (SudokuNumberGrid, gobject.GObject):
         self._blank_grid()
         self._setup_grid(grid, group_size)
 
-    @simple_debug
     def load_game (self, game):
         """Load a game.
 
@@ -363,7 +355,6 @@ class SudokuGameDisplay (SudokuNumberGrid, gobject.GObject):
                     if values[index] and not self.grid._get_(col, row):
                         self.add_value(col, row, values[index])
 
-    @simple_debug
     def _setup_grid(self, grid, group_size):
         self.doing_initial_setup = True
         self.__error_pairs__ = ParallelDict()
@@ -378,7 +369,6 @@ class SudokuGameDisplay (SudokuNumberGrid, gobject.GObject):
                     self.add_value(x, y, val)
         self.doing_initial_setup = False
 
-    @simple_debug
     def _entry_callback(self, widget, *args):
         if not widget.get_text():
             if self.grid and self.grid._get_(widget.x, widget.y):
@@ -402,7 +392,6 @@ class SudokuGameDisplay (SudokuNumberGrid, gobject.GObject):
                 else:
                     self._show_hint_for_entry(e)
 
-    @simple_debug
     def _entry_validate(self, widget, *args):
         val = widget.get_value()
         self.add_value(widget.x, widget.y, val)
@@ -420,7 +409,6 @@ class SudokuGameDisplay (SudokuNumberGrid, gobject.GObject):
             self.__entries__[conflict].set_error_highlight(True)
         self.__error_pairs__[(x, y)] = conflicts
 
-    @simple_debug
     def add_value (self, x, y, val, trackers = []):
         """Add value val at position x, y.
 
@@ -460,7 +448,6 @@ class SudokuGameDisplay (SudokuNumberGrid, gobject.GObject):
         # Draw our entry
         self.__entries__[(x, y)].queue_draw()
 
-    @simple_debug
     def remove (self, x, y, do_removal = False):
         """Remove x, y from our visible grid.
 
@@ -495,7 +482,6 @@ class SudokuGameDisplay (SudokuNumberGrid, gobject.GObject):
                     linked_entry = self.__entries__[coord]
                     linked_entry.set_error_highlight(False)
 
-    @simple_debug
     def auto_fill (self):
         changed = self.grid.auto_fill()
         retval = []
@@ -511,7 +497,6 @@ class SudokuGameDisplay (SudokuNumberGrid, gobject.GObject):
         return retval
 
 
-    @simple_debug
     def auto_fill_current_entry (self):
         e = self.focused
         if not e:
@@ -521,7 +506,6 @@ class SudokuGameDisplay (SudokuNumberGrid, gobject.GObject):
             e.set_text_interactive('')
             e.set_text_interactive(str(filled[1]))
 
-    @simple_debug
     def _mark_impossible_implications(self, x, y):
         if not self.grid:
             return
@@ -536,7 +520,6 @@ class SudokuGameDisplay (SudokuNumberGrid, gobject.GObject):
                 self.__entries__[(x, y)].set_impossible(False)
         self.impossibilities = implications
 
-    @simple_debug
     def create_tracker (self, identifier = 0):
         if not identifier:
             identifier = 0
@@ -572,7 +555,6 @@ class SudokuGameDisplay (SudokuNumberGrid, gobject.GObject):
             TRACKER_COLORS.append(random_color)
             return self.get_tracker_color(identifier)
 
-    @simple_debug
     def toggle_tracker (self, identifier, value):
         """Toggle tracking for tracker identified by identifier."""
         self.__trackers_tracking__[identifier] = value
diff --git a/gnome-sudoku/src/lib/main.py b/gnome-sudoku/src/lib/main.py
index c6e7cf6..853a2c3 100644
--- a/gnome-sudoku/src/lib/main.py
+++ b/gnome-sudoku/src/lib/main.py
@@ -7,6 +7,7 @@ except ImportError, err:
 
 import os.path
 import threading
+import optparse
 
 import gobject
 import gtk
@@ -23,7 +24,6 @@ import timer
 from defaults import (APPNAME, APPNAME_SHORT, AUTHORS, COPYRIGHT, DESCRIPTION,
         IMAGE_DIR, LICENSE, MIN_NEW_PUZZLES, UI_DIR, VERSION, WEBSITE, WEBSITE_LABEL)
 from gtk_goodies import gconf_wrapper, Undo, dialog_extras
-from simple_debug import simple_debug, options
 
 import contact_selector
 import tp_tube
@@ -121,7 +121,6 @@ class UI (gconf_wrapper.GConfWrapper):
                      'auto_save_interval':60 # auto-save interval in seconds...
                      }
 
-    @simple_debug
     def __init__ (self, run_selector = True):
         """run_selector means that we start our regular game.
 
@@ -395,7 +394,6 @@ class UI (gconf_wrapper.GConfWrapper):
               self.main_actions.get_action('Tracker')),
              ])
 
-    @simple_debug
     def start_worker_thread (self, *args):
         n_new_puzzles = self.sudoku_maker.n_puzzles(new = True)
         if n_new_puzzles < self.gconf['minimum_number_of_new_puzzles']:
@@ -407,7 +405,6 @@ class UI (gconf_wrapper.GConfWrapper):
             self.worker.start()
         return True
 
-    @simple_debug
     def stop_worker_thread (self, *args):
         if hasattr(self, 'worker'):
             self.sudoku_maker.stop()
@@ -419,7 +416,6 @@ class UI (gconf_wrapper.GConfWrapper):
             self.dancer.stop_dancing()
             delattr(self, 'dancer')
 
-    @simple_debug
     def you_win_callback (self, grid):
         if hasattr(self, 'dancer'):
             return
@@ -450,7 +446,6 @@ class UI (gconf_wrapper.GConfWrapper):
                                    sublabel = sublabel
                                    )
 
-    @simple_debug
     def initialize_prefs (self):
         for k, v in self.initial_prefs.items():
             try:
@@ -459,7 +454,6 @@ class UI (gconf_wrapper.GConfWrapper):
                 self.gconf[k] = v
         self.player = self.gconf['player']
 
-    @simple_debug
     def new_cb (self, *args):
         if self._close_current_game():
             choice = self._select_game()
@@ -474,7 +468,6 @@ class UI (gconf_wrapper.GConfWrapper):
         else:
             print "None selected"
 
-    @simple_debug
     def _close_current_game (self):
         """Close current running game
 
@@ -501,12 +494,10 @@ class UI (gconf_wrapper.GConfWrapper):
         self.history.clear()
         self.won = False
 
-    @simple_debug
     def resize_cb (self, widget, event):
         self.gconf['width'] = event.width
         self.gconf['height'] = event.height
 
-    @simple_debug
     def quit_cb (self, *args):
         self.w.hide()
         if (self.gsd.grid
@@ -529,7 +520,6 @@ class UI (gconf_wrapper.GConfWrapper):
         except RuntimeError:
             pass
 
-    @simple_debug
     def save_game (self, *args):
         self.sudoku_tracker.save_game(self)
 
@@ -541,7 +531,6 @@ class UI (gconf_wrapper.GConfWrapper):
             self.w.fullscreen()
             self.is_fullscreen = True
 
-    @simple_debug
     def clear_cb (self, *args):
         clearer = Undo.UndoableObject(
             self.do_clear, #action
@@ -572,11 +561,9 @@ class UI (gconf_wrapper.GConfWrapper):
             )
         clearer.perform()
 
-    @simple_debug
     def show_hint_cb (self, *args):
         self.gsd.show_hint()
 
-    @simple_debug
     def auto_hint_cb (self, action):
         if action.get_active():
             self.gsd.always_show_hints = True
@@ -585,14 +572,12 @@ class UI (gconf_wrapper.GConfWrapper):
             self.gsd.always_show_hints = False
             self.gsd.clear_hints()
 
-    @simple_debug
     def impossible_implication_cb (self, action):
         if action.get_active():
             self.gsd.show_impossible_implications = True
         else:
             self.gsd.show_impossible_implications = False
 
-    @simple_debug
     def auto_fill_cb (self, *args):
         if not hasattr(self, 'autofilled'):
             self.autofilled = []
@@ -615,11 +600,9 @@ class UI (gconf_wrapper.GConfWrapper):
         if self.gconf['always_show_hints']:
             self.gsd.update_all_hints()
 
-    @simple_debug
     def auto_fill_current_square_cb (self, *args):
         self.gsd.auto_fill_current_entry()
 
-    @simple_debug
     def setup_tracker_interface (self):
         self.trackers = {}
         self.tracker_ui = TrackerBox(self)
@@ -627,14 +610,12 @@ class UI (gconf_wrapper.GConfWrapper):
         self.tracker_ui.hide()
         self.game_box.add(self.tracker_ui)
 
-    @simple_debug
     def tracker_toggle_cb (self, widg):
         if widg.get_active():
             self.tracker_ui.show_all()
         else:
             self.tracker_ui.hide()
 
-    @simple_debug
     def toggle_toolbar_cb (self, widg):
         if widg.get_active():
             self.tb.show()
@@ -668,7 +649,6 @@ class UI (gconf_wrapper.GConfWrapper):
         else:
             self.gsd.toggle_highlight(False)
 
-    @simple_debug
     def show_info_cb (self, *args):
         if not self.gsd.grid:
             dialog_extras.show_message(parent = self.w,
@@ -695,14 +675,12 @@ class UI (gconf_wrapper.GConfWrapper):
                                    label = _("Puzzle Statistics"),
                                    sublabel = information)
 
-    @simple_debug
     def toggle_generator_cb (self, toggle):
         if toggle.get_active():
             self.start_worker_thread()
         else:
             self.stop_worker_thread()
 
-    @simple_debug
     def autosave (self):
         # this is called on a regular loop and will autosave if we
         # have reason to...
@@ -710,7 +688,6 @@ class UI (gconf_wrapper.GConfWrapper):
             self.sudoku_tracker.save_game(self)
         return True
 
-    @simple_debug
     def show_about (self, *args):
         about = gtk.AboutDialog()
         about.set_transient_for(self.w)
@@ -728,7 +705,6 @@ class UI (gconf_wrapper.GConfWrapper):
         about.connect("response", lambda d, r: d.destroy())
         about.show()
 
-    @simple_debug
     def show_help (self, *args):
         try:
             gtk.show_uri(self.w.get_screen(), "ghelp:gnome-sudoku", gtk.get_current_event_time())
@@ -736,22 +712,18 @@ class UI (gconf_wrapper.GConfWrapper):
             # FIXME: This should create a pop-up dialog
             print _('Unable to display help: %s') % str(error)
 
-    @simple_debug
     def print_game (self, *args):
         printing.print_sudokus([self.gsd], self.w)
 
-    @simple_debug
     def print_multiple_games (self, *args):
         gp = printing.GamePrinter(self.sudoku_maker, self.gconf)
         gp.run_dialog()
 
-    @simple_debug
     def generate_puzzle_gui (self, *args):
         sudoku_generator_gui.GameGenerator(self, self.gconf)
 
 class TrackerBox (gtk.VBox):
 
-    @simple_debug
     def __init__ (self, main_ui):
 
         gtk.VBox.__init__(self)
@@ -765,14 +737,12 @@ class TrackerBox (gtk.VBox):
         self._setup_tree()
         self.show_all()
 
-    @simple_debug
     def reset (self):
 
         for tree in self.tracker_model:
             if tree[0] > -1:
                 self.tracker_model.remove(tree.iter)
 
-    @simple_debug
     def _setup_tree (self):
         self.tracker_tree = self.builder.get_object('treeview1')
         self.tracker_model = gtk.ListStore(int, gtk.gdk.Pixbuf, str)
@@ -785,7 +755,6 @@ class TrackerBox (gtk.VBox):
         self.tracker_model.append([-1, None, _('No Tracker')])
         self.tracker_tree.get_selection().connect('changed', self._selection_changed_cb)
 
-    @simple_debug
     def _setup_actions (self):
         self.tracker_actions = gtk.ActionGroup('tracker_actions')
         self.tracker_actions.add_actions(
@@ -812,7 +781,6 @@ class TrackerBox (gtk.VBox):
         # Default to insensitive (they only become sensitive once a tracker is added)
         self.tracker_actions.set_sensitive(False)
 
-    @simple_debug
     def add_tracker (self):
         tracker_id = self.main_ui.gsd.create_tracker()
         pixbuf = self._pixbuf_transform_color(
@@ -827,7 +795,6 @@ class TrackerBox (gtk.VBox):
                                   )
             )
 
-    @simple_debug
     def _pixbuf_transform_color (self, pixbuf, color):
         """Return new pixbuf with color changed to color"""
         pixbuf_str = pixbuf.get_pixels()
@@ -842,13 +809,11 @@ class TrackerBox (gtk.VBox):
         return gtk.gdk.pixbuf_new_from_data(pixbuf_str_new, gtk.gdk.COLORSPACE_RGB, True, 8, 
                                             pixbuf.get_width(), pixbuf.get_height(), pixbuf.get_rowstride())
 
-    @simple_debug
     def select_tracker (self, tracker_id):
         for row in self.tracker_model:
             if row[0] == tracker_id:
                 self.tracker_tree.get_selection().select_iter(row.iter)
 
-    @simple_debug
     def _selection_changed_cb (self, selection):
         mod, itr = selection.get_selected()
         if itr:
@@ -864,7 +829,6 @@ class TrackerBox (gtk.VBox):
                 self.main_ui.gsd.toggle_tracker(tid, tid == selected_tracker_id)
         self.tracker_actions.set_sensitive(selected_tracker_id != -1)
 
-    @simple_debug
     def _clear_cb (self, action):
         mod, itr = self.tracker_tree.get_selection().get_selected()
         # This should only be called if there is an itr, but we'll
@@ -873,13 +837,11 @@ class TrackerBox (gtk.VBox):
             selected_tracker_id = mod.get_value(itr, 0)
             self._tracker_delete_tracks(selected_tracker_id)
 
-    @simple_debug
     def _keep_cb (self, action):
         mod, itr = self.tracker_tree.get_selection().get_selected()
         selected_tracker_id = mod.get_value(itr, 0)
         self._tracker_keep_tracks(selected_tracker_id)
 
-    @simple_debug
     def _tracker_delete_tracks (self, tracker_id):
         clearer = Undo.UndoableObject(
             lambda *args: self.main_ui.cleared.append(self.main_ui.gsd.delete_by_tracker(tracker_id)),
@@ -887,7 +849,6 @@ class TrackerBox (gtk.VBox):
             self.main_ui.history)
         clearer.perform()
 
-    @simple_debug
     def _tracker_keep_tracks (self, tracker_id):
         clearer = Undo.UndoableObject(
             lambda *args: self.main_ui.cleared.append(self.main_ui.gsd.delete_except_for_tracker(tracker_id)),
@@ -897,6 +858,21 @@ class TrackerBox (gtk.VBox):
 
 
 def start_game ():
+    parser = optparse.OptionParser(
+        version = VERSION,
+        option_list = [
+            optparse.make_option("-v", const=True, action="store_const",
+                dest="debug", help="Print debug information",
+                default=False),
+            optparse.make_option("-p", const=True, action="store_const",
+                dest="profile", help="Profile gnome-sudoku",
+                default=False),
+            optparse.make_option("-w", const=True, action="store_const",
+                dest="walk", help="Step through program",
+                default=False)])
+
+    options, args = parser.parse_args()
+
     if options.debug:
         print 'Starting GNOME Sudoku in debug mode'