PEP8 code corrections

2 files changed, 49 insertions, 38 deletions

diff --git a/file_choosers.py b/file_choosers.py
index 68413ce..fe88237 100644
--- a/file_choosers.py
+++ b/file_choosers.py
@@ -28,11 +28,14 @@ from sugar.graphics.objectchooser import ObjectChooser
 
 OPEN_FROM_JOURNAL = -12
 
+
 def open_from_journal(button, filechooser, activity=None):
         if filechooser:
-            chooser = ObjectChooser(parent=filechooser, what_filter=mime.GENERIC_TYPE_TEXT)
+                chooser = ObjectChooser(parent=filechooser,
+                                        what_filter=mime.GENERIC_TYPE_TEXT)
         else:
-            chooser = ObjectChooser(what_filter=mime.GENERIC_TYPE_TEXT)
+                chooser = ObjectChooser(parent=activity,
+                                        what_filter=mime.GENERIC_TYPE_TEXT)
         result = chooser.run()
         chooser.destroy()
         if result == gtk.RESPONSE_ACCEPT:
@@ -41,28 +44,30 @@ def open_from_journal(button, filechooser, activity=None):
         else:
                 path = None
         if filechooser:
-            filechooser.path = path
-            filechooser.response(OPEN_FROM_JOURNAL)
-        else: activity.open_file(None, from_journal=path)
+                filechooser.path = path
+                filechooser.response(OPEN_FROM_JOURNAL)
+        else:
+                activity.open_file(None, from_journal=path)
+
 
 def open_file_dialog():
         dialog = gtk.FileChooserDialog(_("Open..."),
                                        None,
                                        gtk.FILE_CHOOSER_ACTION_OPEN,
-                                       (gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL, \
-                                               gtk.STOCK_OPEN, gtk.RESPONSE_OK))
+                                       (gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL,
+                                        gtk.STOCK_OPEN, gtk.RESPONSE_OK))
         dialog.set_default_response(gtk.RESPONSE_OK)
-        
+
         filter = gtk.FileFilter()
         filter.set_name(_("All files"))
         filter.add_pattern("*")
         dialog.add_filter(filter)
-        
+
         filter = gtk.FileFilter()
         filter.set_name(_("All text files"))
         filter.add_mime_type("text/*")
         dialog.add_filter(filter)
-        
+
         lang_ids = langs
         for i in lang_ids:
                 lang = langsmanager.get_language(i)
@@ -71,7 +76,7 @@ def open_file_dialog():
                 for m in lang.get_mime_types():
                         filter.add_mime_type(m)
                 dialog.add_filter(filter)
-                
+
         open_from_journal_button = gtk.Button(_("Open from Journal"))
         open_from_journal_button.connect("clicked", open_from_journal, dialog)
         open_from_journal_button.show()
@@ -87,10 +92,11 @@ def open_file_dialog():
         dialog.destroy()
         return to_return, True
 
+
 def confirm_overwrite(widget):
         dialog = gtk.MessageDialog(type=gtk.MESSAGE_QUESTION)
-        dialog.add_buttons(gtk.STOCK_NO, gtk.RESPONSE_CANCEL, gtk.STOCK_YES, 
-                           gtk.RESPONSE_ACCEPT)
+        dialog.add_buttons(gtk.STOCK_NO, gtk.RESPONSE_CANCEL,
+                           gtk.STOCK_YES, gtk.RESPONSE_ACCEPT)
         dialog.set_markup("<b>%s</b>" % _("This file name already exists"))
         dialog.format_secondary_text(_("Overwrite the file?"))
         response = dialog.run()
@@ -100,6 +106,7 @@ def confirm_overwrite(widget):
         else:
                 return gtk.FILE_CHOOSER_CONFIRMATION_SELECT_AGAIN
 
+
 def save_file_dialog():
         dialog = gtk.FileChooserDialog(_("Save..."),
                                        None,
@@ -109,17 +116,17 @@ def save_file_dialog():
         dialog.set_default_response(gtk.RESPONSE_OK)
         dialog.set_do_overwrite_confirmation(True)
         dialog.connect("confirm-overwrite", confirm_overwrite)
-        
+
         filter = gtk.FileFilter()
         filter.set_name(_("All files"))
         filter.add_pattern("*")
         dialog.add_filter(filter)
-        
+
         filter = gtk.FileFilter()
         filter.set_name(_("All text files"))
         filter.add_mime_type("text/*")
         dialog.add_filter(filter)
-        
+
         lang_ids = langs
         for i in lang_ids:
                 lang = langsmanager.get_language(i)
diff --git a/font_options.py b/font_options.py
index 895bec8..b257e4d 100644
--- a/font_options.py
+++ b/font_options.py
@@ -27,14 +27,17 @@ from sugar.graphics.combobox import ComboBox
 from sugar.graphics.toolcombobox import ToolComboBox
 from sugar.activity.widgets import ToolbarButton
 
+
 class FontToolbarButton(ToolbarButton):
-        __gsignals__ = {'load-pango-context' : (gobject.SIGNAL_RUN_LAST, 
-                                                gobject.TYPE_PYOBJECT, tuple()),
-                        'font-changed' : (gobject.SIGNAL_RUN_LAST, 
-                                          gobject.TYPE_NONE, 
-                                         (gobject.TYPE_STRING, 
-                                          gobject.TYPE_STRING, 
+        __gsignals__ = {'load-pango-context': (gobject.SIGNAL_RUN_LAST,
+                                                gobject.TYPE_PYOBJECT,
+                                                tuple()),
+                        'font-changed': (gobject.SIGNAL_RUN_LAST,
+                                          gobject.TYPE_NONE,
+                                         (gobject.TYPE_STRING,
+                                          gobject.TYPE_STRING,
                                           gobject.TYPE_INT))}
+
         def __init__(self):
                 ToolbarButton.__init__(self)
                 self.toolbar = gtk.Toolbar()
@@ -42,17 +45,17 @@ class FontToolbarButton(ToolbarButton):
                 self.props.icon_name = 'format-text'
                 self.family = "Monospace"
                 self.current_face = "Regular"
-        
+
         def size_changed(self, adjustment):
-                self.emit("font-changed", self.family, self.current_face, 
-                                          adjustment.get_value())
-        
+                self.emit("font-changed", self.family,
+                          self.current_face, adjustment.get_value())
+
         def face_changed(self, widget):
                 iter = widget.get_active_iter()
                 self.current_face = self.faces[self.family].get_value(iter, 0)
-                self.emit('font-changed', self.family, self.current_face, 
-                          self.size_adj.get_value())
-        
+                self.emit('font-changed', self.family,
+                          self.current_face, self.size_adj.get_value())
+
         def family_changed(self, widget):
                 iter = widget.get_active_iter()
                 self.family = self.family_model.get_value(iter, 0)
@@ -72,15 +75,16 @@ class FontToolbarButton(ToolbarButton):
                 count = 0
                 self.faces = {}
                 for i in self.context.list_families():
-                        count += 1
                         name = i.get_name()
-                        if name == "Monospace": monospace_index = count - 1
+                        monospace_index = count if name == "Monospace" else 0
+                        count += 1
                         self.family_model.append([name])
                         family_faces = gtk.ListStore(str, str)
                         for face in i.list_faces():
                                 face_name = face.get_face_name()
-                                family_faces.append([face_name, "%s %s" % (
-                                                              name, face_name)])
+                                family_faces.append([face_name,
+                                                     "%s %s" %
+                                                     (name, face_name)])
                         self.faces[name] = family_faces
                 self.family_combo.set_model(self.family_model)
                 self.family_combo.set_active(monospace_index)
@@ -89,7 +93,7 @@ class FontToolbarButton(ToolbarButton):
                 self.family_tool_item = ToolComboBox(self.family_combo)
                 self.family_tool_item.show()
                 self.toolbar.insert(self.family_tool_item, -1)
-                
+
                 self.face_combo = ComboBox()
                 face_renderer = gtk.CellRendererText()
                 face_renderer.set_property("family-set", True)
@@ -104,9 +108,9 @@ class FontToolbarButton(ToolbarButton):
                 self.face_tool_item = ToolComboBox(self.face_combo)
                 self.face_tool_item.show()
                 self.toolbar.insert(self.face_tool_item, -1)
-                
-                self.size_adj = gtk.Adjustment(value=10, lower=5, upper=100, 
-                                               step_incr=1)
+
+                self.size_adj = gtk.Adjustment(value=10, lower=5,
+                                               upper=100, step_incr=1)
                 self.size_adj.connect("value-changed", self.size_changed)
                 self.size_spin = gtk.SpinButton(self.size_adj)
                 self.size_spin.show()
@@ -114,5 +118,5 @@ class FontToolbarButton(ToolbarButton):
                 self.size_spin_item.add(self.size_spin)
                 self.size_spin_item.show()
                 self.toolbar.insert(self.size_spin_item, -1)
-                
+
                 self.toolbar.show()