pep8 fixes and pep8_check.py fixes

Pep8 fixes in
	* activity.py
	* editor.py
	* file_choosers.py
	* font_options.py
	* pep8_check.py
Also modified pep8_check.py

Signed-off-by: Agustin Zubiaga <aguzubiaga97@gmail.com>

5 files changed, 98 insertions, 57 deletions

diff --git a/activity.py b/activity.py
index 18924d6..dc24acf 100644
--- a/activity.py
+++ b/activity.py
@@ -60,7 +60,8 @@ class JAMEdit(activity.Activity):
                 self.editor = Editor(self)
                 self.editor.set_size_request(800, 790)
                 scroll = gtk.ScrolledWindow()
-                scroll.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
+                scroll.set_policy(gtk.POLICY_AUTOMATIC,
+								  gtk.POLICY_AUTOMATIC)
                 scroll.add(self.editor)
                 scroll.show_all()
 
@@ -98,13 +99,13 @@ class JAMEdit(activity.Activity):
 
                 activity_toolbar.show_all()
                 activity_toolbar.stop.hide()
-                
+
                 # Guardar como / Save As
                 save_as = gtk.MenuItem(_("Save on the file system."))
                 activity_toolbar.keep.props.palette.menu.append(save_as)
                 save_as.connect("activate", self.save_file_as)
                 save_as.show()
-                
+
                 # Nuevo / New
                 new = ToolButton("new")
                 new.set_tooltip(_("New file"))
@@ -133,9 +134,10 @@ class JAMEdit(activity.Activity):
                 separator.set_draw(False)
                 separator.set_expand(True)
                 edit_toolbar.insert(separator, -1)
-                
+
                 insert_datetime = ToolButton("insert-datetime")
-                insert_datetime.connect("clicked", self.editor._insert_date_time)
+                insert_datetime.connect("clicked",
+                                        self.editor._insert_date_time)
                 edit_toolbar.insert(insert_datetime, -1)
                 insert_datetime.show_all()
 
@@ -196,7 +198,7 @@ class JAMEdit(activity.Activity):
 
                 show_line_numbers.set_active(True)
                 show_line_numbers.connect("clicked", \
-                                        self.editor._set_show_line_numbers)
+                                     self.editor._set_show_line_numbers)
                 show_line_numbers.show()
                 preferences_toolbar.insert(show_line_numbers, -1)
 
@@ -209,9 +211,10 @@ class JAMEdit(activity.Activity):
                 preferences.show_all()
 
                 self.toolbar_box.toolbar.insert(preferences, -1)
-                
+
                 font_options = FontToolbarButton()
-                font_options.connect("load-pango-context", self.load_pango_context)
+                font_options.connect("load-pango-context",
+									 self.load_pango_context)
                 font_options.load_toolbar()
                 font_options.connect("font-changed", self.change_font)
                 self.toolbar_box.toolbar.insert(font_options, -1)
@@ -240,18 +243,21 @@ class JAMEdit(activity.Activity):
                 vbox.pack_end(self.pep8_bar, False, True, 0)
 
         def change_font(self, widget, family, face, size):
-                self.editor.modify_font(pango.FontDescription("%s %s %d" % (family, face, size)))
+                self.editor.modify_font(
+               pango.FontDescription("%s %s %d" % (family, face, size)))
 
         def load_pango_context(self, widget):
                 return self.editor.get_pango_context()
-        
+
         def pep8_check(self, widget):
-                self.editor.pep8.check_file(self.editor._get_all_text(), self.editor)
+                self.editor.pep8.check_file(self.editor._get_all_text(),
+										    self.editor)
 
         def close(self, skip_save=False):
                 close = True
                 if not self.editor.file:
-                        close = self.save_file(None, type="exit", mode=2)
+                        close = self.save_file(None, type="exit",
+											   mode=2)
                 if close:
                         activity.Activity.close(self)
 
@@ -260,9 +266,9 @@ class JAMEdit(activity.Activity):
                 file_path = file_choosers.open_file_dialog()
                 if file_path != None:
                         self.set_title(os.path.split(file_path)[-1])
-                        mime_type = mime.get_from_file_name(file_path)            
+                        mime_type = mime.get_from_file_name(file_path)
                         self.metadata["mime_type"] = mime_type
-                
+
                         file = open(file_path, "r")
                         self.editor.buffer.set_text(file.read())
                         self.editor.file = file_path
@@ -271,7 +277,7 @@ class JAMEdit(activity.Activity):
 
         def new(self, widget):
                 _continue = self.save_file(None, type="exit")
-                if _contiue:
+                if _continue:
                         self.metadata["mime_type"] = "text/x-generic"
                         self.editor.lang = None
                         self.editor.file = None
@@ -290,10 +296,10 @@ class JAMEdit(activity.Activity):
                         file.close()
 
                         self.set_title(os.path.split(file_path)[-1])
-                        mime_type = mime.get_from_file_name(file_path)            
+                        mime_type = mime.get_from_file_name(file_path)
                         self.metadata["mime_type"] = mime_type
                         self.editor.file = file_path
-                        self.editor._search_and_active_language(mime_type)                       
+                        self.editor._search_and_active_language(mime_type)
 
         def save_file(self, widget, type=None, mode=1):
                 if not type:
@@ -305,31 +311,46 @@ class JAMEdit(activity.Activity):
                                 file_path = file_choosers.save_file_dialog()
                                 if file_path:
                                         self.editor.file = file_path
-                                        file = open(self.editor.file, "w")
+                                        file = open(self.editor.file,
+													"w")
                                         file.write(self.editor._get_all_text())
                                         file.close()
                 if type == "exit":
-                        dialog = gtk.MessageDialog(type=gtk.MESSAGE_QUESTION)
-                        dialog.add_buttons(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL, gtk.STOCK_NO, gtk.RESPONSE_NO, gtk.STOCK_YES, gtk.RESPONSE_YES)
+                        dialog = gtk.MessageDialog(type= \
+												   gtk.MESSAGE_QUESTION)
+                        dialog.add_buttons(gtk.STOCK_CANCEL,
+									       gtk.RESPONSE_CANCEL,
+										   gtk.STOCK_NO,
+										   gtk.RESPONSE_NO,
+										   gtk.STOCK_YES,
+										   gtk.RESPONSE_YES)
                         dialog.set_markup("<b>%s</b>" % _("Save changes..."))
                         if mode == 1:
-                                dialog.format_secondary_text(_("Do you want to save changes?"))
+                                dialog.format_secondary_text(
+                                            _("Do you want to save changes?"))
                         elif mode == 2:
-                                dialog.format_secondary_text(_("Do you want to save changes\nin the file system?"))
+                                dialog.format_secondary_text(
+                        _("Do you want to save changes\nin the file system?"))
                         response = dialog.run()
                         dialog.destroy()
                         if not response == gtk.RESPONSE_CANCEL:
                                 if response == gtk.RESPONSE_YES:
                                         if self.editor.file:
-                                                file = open(self.editor.file, "w")
-                                                file.write(self.editor._get_all_text())
+                                                file = open(
+												  self.editor.file, "w")
+                                                file.write(
+										    self.editor._get_all_text())
                                                 file.close()
                                         else:
-                                                file_path = file_choosers.save_file_dialog()
+                                                file_path = \
+                                        file_choosers.save_file_dialog()
                                                 if file_path:
-                                                        self.editor.file = file_path
-                                                        file = open(self.editor.file, "w")
-                                                        file.write(self.editor._get_all_text())
+                                                        self.editor.file = \
+                                                                      file_path
+                                                        file = open(
+                                                         self.editor.file, "w")
+                                                        file.write(
+                                                   self.editor._get_all_text())
                                                         file.close()
                                 return True
                         else: return False
diff --git a/editor.py b/editor.py
index b4a5b94..d314f0e 100644
--- a/editor.py
+++ b/editor.py
@@ -38,7 +38,8 @@ from pep8_check import PEP8_Check
 STYLE_MANAGER = gtksourceview2.style_scheme_manager_get_default()
 # Style Files extracted from / Archivos Style extraidos de :
 # http://live.gnome.org/GtkSourceView/StyleSchemes
-STYLE_MANAGER.append_search_path(os.path.join(os.environ["SUGAR_BUNDLE_PATH"], "styles"))
+STYLE_MANAGER.append_search_path(os.path.join(os.environ["SUGAR_BUNDLE_PATH"],
+                                              "styles"))
 STYLES = STYLE_MANAGER.get_scheme_ids()
 LANGUAGE_MANAGER = gtksourceview2.language_manager_get_default()
 LANGUAGES = LANGUAGE_MANAGER.get_language_ids()
@@ -221,8 +222,10 @@ class Editor(gtksourceview2.View):
                         next_result = self.get_next_result('forward')
                         _1 = prev_result != None
                         _2 = next_result != None
-                        self.activity._search_prev.props.sensitive = prev_result != _1
-                        self.activity._search_next.props.sensitive = next_result != _1
+                        self.activity._search_prev.props.sensitive = \
+                                                              prev_result != _1
+                        self.activity._search_next.props.sensitive = \
+                                                              next_result != _1
 
         def set_search_text(self, text):
                 self.search_text = text
@@ -251,10 +254,14 @@ class Editor(gtksourceview2.View):
                 _buffer = self.get_buffer()
 
                 if direction == 'forward':
-                        text_iter = _buffer.get_iter_at_mark(_buffer.get_insert())
+                        text_iter = \
+                                  _buffer.get_iter_at_mark(_buffer.get_insert(
+                                                                             ))
                         text_iter.forward_char()
                 else:
-                        text_iter = _buffer.get_iter_at_mark(_buffer.get_insert())
+                        text_iter = \
+                                  _buffer.get_iter_at_mark(_buffer.get_insert(
+                                                                             ))
 
                 if direction == 'backward':
                         return text_iter.backward_search(self.search_text, 0)
diff --git a/file_choosers.py b/file_choosers.py
index 2eb5b04..69fa74f 100644
--- a/file_choosers.py
+++ b/file_choosers.py
@@ -25,10 +25,10 @@ import gtk
 
 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))
+                                       None,
+                                       gtk.FILE_CHOOSER_ACTION_OPEN,
+                                       (gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL, \
+                                               gtk.STOCK_OPEN, gtk.RESPONSE_OK))
         dialog.set_default_response(gtk.RESPONSE_OK)
         
         filter = gtk.FileFilter()
@@ -59,7 +59,8 @@ def open_file_dialog():
 
 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()
@@ -71,10 +72,10 @@ def confirm_overwrite(widget):
 
 def save_file_dialog():
         dialog = gtk.FileChooserDialog(_("Save..."),
-                                                                   None,
-                                                                   gtk.FILE_CHOOSER_ACTION_SAVE,
-                                                                   (gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL,
-                                                                        gtk.STOCK_SAVE, gtk.RESPONSE_OK))
+                                       None,
+                                       gtk.FILE_CHOOSER_ACTION_SAVE,
+                                       (gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL,
+                                        gtk.STOCK_SAVE, gtk.RESPONSE_OK))
         dialog.set_default_response(gtk.RESPONSE_OK)
         dialog.set_do_overwrite_confirmation(True)
         dialog.connect("confirm-overwrite", confirm_overwrite)
diff --git a/font_options.py b/font_options.py
index 3dcd9d8..895bec8 100644
--- a/font_options.py
+++ b/font_options.py
@@ -28,8 +28,13 @@ 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, gobject.TYPE_INT))}
+        __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()
@@ -39,12 +44,14 @@ class FontToolbarButton(ToolbarButton):
                 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()
@@ -72,7 +79,8 @@ class FontToolbarButton(ToolbarButton):
                         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)
@@ -97,7 +105,8 @@ class FontToolbarButton(ToolbarButton):
                 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()
diff --git a/pep8_check.py b/pep8_check.py
index a0ab2dd..a1c2dd7 100644
--- a/pep8_check.py
+++ b/pep8_check.py
@@ -48,18 +48,20 @@ class PEP8_Check():
         for line in text.split("\n"):
             num += 1
             if str(num) in chk:
-                line_iter = editor.buffer.get_iter_at_line(num-1)
-                if num == 0:
-                    editor.buffer.insert_with_tags(line_iter, line, editor.error_tag)
+                line_iter = editor.buffer.get_iter_at_line(num)
+                if num == len(text.split("\n"))-1:
+                    editor.buffer.insert_with_tags(line_iter, line, \
+                                                   editor.error_tag)
                 else:
-                    editor.buffer.insert_with_tags(line_iter, "\n"+line, editor.error_tag)
-            elif not num in chk:
-                char = 0
+                    editor.buffer.insert_with_tags(line_iter, line+"\n", \
+                                                   editor.error_tag)
+            else:
                 line_iter = editor.buffer.get_iter_at_line(num)
-                if num == 0:
+                if num == len(text.split("\n"))-1:
                         editor.buffer.insert_with_tags_by_name(line_iter, line)
                 else:
-                        editor.buffer.insert_with_tags_by_name(line_iter, "\n"+line)
+                        editor.buffer.insert_with_tags_by_name(line_iter, \
+                                                               line+"\n")
         editor.connect("move-cursor", self.set_bar_text, chk)
 
     def get_check(self):
@@ -96,7 +98,8 @@ class PEP8_Check():
                         this_line_error = check[str(line)]
                         char = this_line_error.split(":")[0]
                         this_line_error = this_line_error.split(":")[1]
-                        self.activity.pep8_bar.label.set_text(str(line)+":"+char+" "+this_line_error)
+                        self.activity.pep8_bar.label.set_text(
+                                         str(line)+":"+char+" "+this_line_error)
                         print this_line_error
                         self.activity.pep8_bar.show_all()
                 else: self.activity.pep8_bar.hide()