pep8 cleanup

2 files changed, 40 insertions, 61 deletions

diff --git a/IKnowMyABCs.py b/IKnowMyABCs.py
index 1ab0f2e..32a517f 100644
--- a/IKnowMyABCs.py
+++ b/IKnowMyABCs.py
@@ -1,4 +1,5 @@
 #Copyright (c) 2012 Walter Bender
+#Copyright (c) 2012 Ignacio Rodriguez
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -10,25 +11,20 @@
 # Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 # Boston, MA 02111-1307, USA.
 
+from gi.repository import Gtk
+from gi.repository import Gdk
 
-import gtk
+from sugar3.activity import activity
+from sugar3.graphics.toolbarbox import ToolbarBox, ToolbarButton
 
-from sugar.activity import activity
-try:
-    from sugar.graphics.toolbarbox import ToolbarBox, ToolbarButton
-    _HAVE_TOOLBOX = True
-except ImportError:
-    _HAVE_TOOLBOX = False
+from sugar3.activity.widgets import ActivityToolbarButton
+from sugar3.activity.widgets import StopButton
 
-if _HAVE_TOOLBOX:
-    from sugar.activity.widgets import ActivityToolbarButton
-    from sugar.activity.widgets import StopButton
-
-from sugar.graphics.toolbutton import ToolButton
-from sugar.graphics.combobox import ComboBox
-from sugar.graphics.toolcombobox import ToolComboBox
-from sugar.datastore import datastore
-from sugar import profile
+from sugar3.graphics.toolbutton import ToolButton
+from sugar3.graphics.combobox import ComboBox
+from sugar3.graphics.toolcombobox import ToolComboBox
+from sugar3.datastore import datastore
+from sugar3 import profile
 
 from gettext import gettext as _
 import os.path
@@ -42,21 +38,21 @@ _logger = logging.getLogger('iknowmyabcs-activity')
 
 
 class IKnowMyABCs(activity.Activity):
-    ''' Learning the alphabet. 
+    ''' Learning the alphabet.
 
     Level1: The alphabet appears and the user has the option to click
     on a letter to listen the name of it and the sound of it.
 
-    Level2: The letters appear randomly and the user must place them
-    in the correct order.
-
-    Level3: The laptop says a letter and the user must click on the
+    Level2: The laptop says a letter and the user must click on the
     correct one. '''
 
     def __init__(self, handle):
         ''' Initialize the toolbars and the reading board '''
         super(IKnowMyABCs, self).__init__(handle)
 
+        self.reading = False
+        self.testing = False
+        self.recording = False
         self.datapath = get_path(activity, 'instance')
 
         if 'LANG' in os.environ:
@@ -82,11 +78,11 @@ class IKnowMyABCs(activity.Activity):
         self._setup_toolbars()
 
         # Create a canvas
-        canvas = gtk.DrawingArea()
-        width = gtk.gdk.screen_width()
-        height = int(gtk.gdk.screen_height())
+        canvas = Gtk.DrawingArea()
+        width = Gdk.Screen.width()
+        height = int(Gdk.Screen.height())
         canvas.set_size_request(width, height)
-        canvas.modify_bg(gtk.STATE_NORMAL, gtk.gdk.color_parse("#000000"))
+        canvas.modify_bg(Gtk.StateType.NORMAL, Gdk.color_parse("#000000"))
         canvas.show()
         self.set_canvas(canvas)
 
@@ -102,33 +98,17 @@ class IKnowMyABCs(activity.Activity):
         # no sharing
         self.max_participants = 1
 
-        if _HAVE_TOOLBOX:
-            toolbox = ToolbarBox()
+        toolbox = ToolbarBox()
 
-            # Activity toolbar
-            activity_button = ActivityToolbarButton(self)
+        # Activity toolbar
+        activity_button = ActivityToolbarButton(self)
 
-            toolbox.toolbar.insert(activity_button, 0)
-            activity_button.show()
-
-            self.set_toolbar_box(toolbox)
-            toolbox.show()
-            primary_toolbar = toolbox.toolbar
-        else:
-            # Use pre-0.86 toolbar design
-            primary_toolbar = gtk.Toolbar()
-            toolbox = activity.ActivityToolbox(self)
-            self.set_toolbox(toolbox)
-            toolbox.add_toolbar(_('Page'), primary_toolbar)
-            toolbox.show()
-            toolbox.set_current_toolbar(1)
-
-            # no sharing
-            if hasattr(toolbox, 'share'):
-                toolbox.share.hide()
-            elif hasattr(toolbox, 'props'):
-                toolbox.props.visible = False
+        toolbox.toolbar.insert(activity_button, 0)
+        activity_button.show()
 
+        self.set_toolbar_box(toolbox)
+        toolbox.show()
+        primary_toolbar = toolbox.toolbar
         button = radio_factory('letter', primary_toolbar, self._letter_cb,
                                tooltip=_('listen to the letter names'))
         radio_factory('picture', primary_toolbar, self._picture_cb,
@@ -150,13 +130,12 @@ class IKnowMyABCs(activity.Activity):
 
         self.status = label_factory(primary_toolbar, '', width=300)
 
-        if _HAVE_TOOLBOX:
-            separator_factory(primary_toolbar, True, False)
+        separator_factory(primary_toolbar, True, False)
 
-            stop_button = StopButton(self)
-            stop_button.props.accelerator = '<Ctrl>q'
-            toolbox.toolbar.insert(stop_button, -1)
-            stop_button.show()
+        stop_button = StopButton(self)
+        stop_button.props.accelerator = '<Ctrl>q'
+        toolbox.toolbar.insert(stop_button, -1)
+        stop_button.show()
 
     def _letter_cb(self, event=None):
         ''' click on card to hear the letter name '''
diff --git a/page.py b/page.py
index 13e4622..341ed64 100644
--- a/page.py
+++ b/page.py
@@ -262,11 +262,11 @@ class Page():
 
     def invalt(self, x, y, w, h):
         ''' Mark a region for refresh '''
-	rectangle = Gdk.Rectangle()
-	rectangle.x = x
-	rectangle.y = y
-	rectangle.width = w
-	rectangle.height = h
+        rectangle = Gdk.Rectangle()
+        rectangle.x = x
+        rectangle.y = y
+        rectangle.width = w
+        rectangle.height = h
         self._canvas.window.invalidate_rect(rectangle)
 
     def load_level(self, path):
@@ -280,7 +280,7 @@ class Page():
         for line in f:
             if len(line) > 0 and line[0] not in '#\n':
                 words = line.split(', ')
-                self._card_data.append([words[0], 
+                self._card_data.append([words[0],
                                         words[1].replace('-', ', ')])
                 if words[2].count('#') > 1:
                     self._color_data.append([words[2].split('/')])