Fix pylint/pep8 warnings

4 files changed, 27 insertions, 29 deletions

diff --git a/src/sugar/activity/widgets.py b/src/sugar/activity/widgets.py
index 123e6ec..e14c1f3 100644
--- a/src/sugar/activity/widgets.py
+++ b/src/sugar/activity/widgets.py
@@ -17,7 +17,6 @@
 
 import gtk
 import gobject
-import logging
 import gettext
 import gconf
 
@@ -179,7 +178,7 @@ class TitleEntry(gtk.ToolItem):
 class ActivityToolbar(gtk.Toolbar):
     """The Activity toolbar with the Journal entry title, sharing,
        Keep and Stop buttons
-    
+
     All activities should have this toolbar. It is easiest to add it to your
     Activity by using the ActivityToolbox.
     """
@@ -214,18 +213,18 @@ class ActivityToolbar(gtk.Toolbar):
 
 class EditToolbar(gtk.Toolbar):
     """Provides the standard edit toolbar for Activities.
- 
+
     Members:
         undo  -- the undo button
         redo  -- the redo button
         copy  -- the copy button
         paste -- the paste button
         separator -- A separator between undo/redo and copy/paste
-    
+
     This class only provides the 'edit' buttons in a standard layout,
     your activity will need to either hide buttons which make no sense for your
     Activity, or you need to connect the button events to your own callbacks:
-    
+
         ## Example from Read.activity:
         # Create the edit toolbar:
         self._edit_toolbar = EditToolbar(self._view)
@@ -234,12 +233,12 @@ class EditToolbar(gtk.Toolbar):
         self._edit_toolbar.redo.props.visible = False
         # Hide the separator too:
         self._edit_toolbar.separator.props.visible = False
-        
+
         # As long as nothing is selected, copy needs to be insensitive:
         self._edit_toolbar.copy.set_sensitive(False)
         # When the user clicks the button, call _edit_toolbar_copy_cb()
         self._edit_toolbar.copy.connect('clicked', self._edit_toolbar_copy_cb)
-        
+
         # Add the edit toolbar:
         toolbox.add_toolbar(_('Edit'), self._edit_toolbar)
         # And make it visible:
@@ -271,17 +270,17 @@ class EditToolbar(gtk.Toolbar):
 
 class ActivityToolbox(Toolbox):
     """Creates the Toolbox for the Activity
-    
+
     By default, the toolbox contains only the ActivityToolbar. After creating
     the toolbox, you can add your activity specific toolbars, for example the
     EditToolbar.
-    
+
     To add the ActivityToolbox to your Activity in MyActivity.__init__() do:
-    
-        # Create the Toolbar with the ActivityToolbar: 
+
+        # Create the Toolbar with the ActivityToolbar:
         toolbox = activity.ActivityToolbox(self)
         ... your code, inserting all other toolbars you need, like EditToolbar
-        
+
         # Add the toolbox to the activity frame:
         self.set_toolbox(toolbox)
         # And make it visible:
@@ -289,7 +288,7 @@ class ActivityToolbox(Toolbox):
     """
     def __init__(self, activity):
         Toolbox.__init__(self)
-        
+
         self._activity_toolbar = ActivityToolbar(activity)
         self.add_toolbar(_('Activity'), self._activity_toolbar)
         self._activity_toolbar.show()
diff --git a/src/sugar/graphics/radiopalette.py b/src/sugar/graphics/radiopalette.py
index 87048f5..70ba2e0 100644
--- a/src/sugar/graphics/radiopalette.py
+++ b/src/sugar/graphics/radiopalette.py
@@ -16,9 +16,6 @@
 # Boston, MA 02111-1307, USA.
 
 import gtk
-import gobject
-import logging
-from gobject import SIGNAL_RUN_FIRST, TYPE_NONE, TYPE_PYOBJECT
 
 from sugar.graphics import style
 from sugar.graphics.toolbutton import ToolButton
diff --git a/src/sugar/graphics/style.py b/src/sugar/graphics/style.py
index a37b745..e63e5ca 100644
--- a/src/sugar/graphics/style.py
+++ b/src/sugar/graphics/style.py
@@ -28,7 +28,7 @@ import logging
 import gtk
 import pango
 
-_FOCUS_LINE_WIDTH = 2
+FOCUS_LINE_WIDTH = 2
 _TAB_CURVATURE = 1
 
 def _compute_zoom_factor():
@@ -115,8 +115,8 @@ FONT_BOLD_H = zoom(24)
 
 TOOLBOX_SEPARATOR_HEIGHT = zoom(9)
 TOOLBOX_HORIZONTAL_PADDING = zoom(75)
-TOOLBOX_TAB_VBORDER = int((zoom(36) - FONT_NORMAL_H - _FOCUS_LINE_WIDTH) / 2)
-TOOLBOX_TAB_HBORDER = zoom(15) - _FOCUS_LINE_WIDTH - _TAB_CURVATURE
+TOOLBOX_TAB_VBORDER = int((zoom(36) - FONT_NORMAL_H - FOCUS_LINE_WIDTH) / 2)
+TOOLBOX_TAB_HBORDER = zoom(15) - FOCUS_LINE_WIDTH - _TAB_CURVATURE
 TOOLBOX_TAB_LABEL_WIDTH = zoom(150 - 15 * 2)
 
 COLOR_BLACK = Color('#000000')
diff --git a/src/sugar/graphics/toolbarbox.py b/src/sugar/graphics/toolbarbox.py
index fac92b9..f9fe73e 100644
--- a/src/sugar/graphics/toolbarbox.py
+++ b/src/sugar/graphics/toolbarbox.py
@@ -15,11 +15,9 @@
 # Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 # Boston, MA 02111-1307, USA.
 
-import logging
-
-import gobject
-from gobject import SIGNAL_RUN_FIRST, TYPE_NONE
 import gtk
+import gobject
+import logging
 
 from sugar.graphics import style
 from sugar.graphics.palette import PaletteWindow, ToolInvoker
@@ -120,13 +118,13 @@ class ToolbarButton(ToolButton):
         self.get_style().paint_box(event.window,
                 gtk.STATE_NORMAL, gtk.SHADOW_IN, event.area, self,
                 'palette-invoker', alloc.x, 0,
-                alloc.width, alloc.height + style._FOCUS_LINE_WIDTH)
+                alloc.width, alloc.height + style.FOCUS_LINE_WIDTH)
 
         if self.child.state != gtk.STATE_PRELIGHT:
             self.get_style().paint_box(event.window,
                     gtk.STATE_NORMAL, gtk.SHADOW_NONE, event.area, self, None,
-                    alloc.x + style._FOCUS_LINE_WIDTH, style._FOCUS_LINE_WIDTH,
-                    alloc.width - style._FOCUS_LINE_WIDTH*2, alloc.height)
+                    alloc.x + style.FOCUS_LINE_WIDTH, style.FOCUS_LINE_WIDTH,
+                    alloc.width - style.FOCUS_LINE_WIDTH*2, alloc.height)
 
         gtk.ToolButton.do_expose_event(self, event)
         _paint_arrow(self, event, gtk.ARROW_UP)
@@ -135,6 +133,7 @@ class ToolbarBox(gtk.VBox):
     def __init__(self, padding=style.TOOLBOX_HORIZONTAL_PADDING):
         gtk.VBox.__init__(self)
         self.expanded_button = None
+        self.background = None
 
         self._toolbar = gtk.Toolbar()
         self._toolbar.owner = self
@@ -155,7 +154,10 @@ class ToolbarBox(gtk.VBox):
             self.remove(button.page_widget)
             self.expanded_button = None
 
-    toolbar = property(lambda self: self._toolbar)
+    def get_toolbar(self):
+        return self._toolbar
+
+    toolbar = property(get_toolbar)
 
     def get_padding(self):
         return self.toolbar.parent.props.left_padding
@@ -270,12 +272,12 @@ def _embody_page(box_class, widget):
     box.show()
     return box
 
-def _paint_arrow(widget, event, type):
+def _paint_arrow(widget, event, arrow_type):
     alloc = widget.allocation
     x = alloc.x + alloc.width / 2 - style.TOOLBAR_ARROW_SIZE / 2
     y = alloc.y + alloc.height - int(style.TOOLBAR_ARROW_SIZE * .85)
 
     widget.get_style().paint_arrow(event.window,
             gtk.STATE_NORMAL, gtk.SHADOW_NONE, event.area, widget,
-            None, type,  True,
+            None, arrow_type, True,
             x, y, style.TOOLBAR_ARROW_SIZE, style.TOOLBAR_ARROW_SIZE)