pep8 & typos

svn: r13001

src/BasicUtils/_NameDisplay.py

@@ -233,11 +233,15 @@ class NameDisplay(object):
 
     def _sort_name_format(self, x, y):
         if x < 0:
-            if y<0: return x+y
-            else: return -x+y
+            if y < 0: 
+                return x+y
             else: 
-            if y<0: return -x+y
-            else: return x-y
+                return -x+y
+        else:
+            if y < 0: 
+                return -x+y
+            else: 
+                return x-y
         
     def _is_format_valid(self, num):
         try:
@@ -256,7 +260,7 @@ class NameDisplay(object):
         going to some length to optimise it as much as possible. 
 
         This method constructs a new function that is specifically written 
-        to format a name given a particualar format string. This is worthwhile
+        to format a name given a particular format string. This is worthwhile
         because the format string itself rarely changes, so by caching the new
         function and calling it directly when asked to format a name to the
         same format string again we can be as quick as possible.
@@ -299,7 +303,7 @@ class NameDisplay(object):
         going to some length to optimise it as much as possible. 
 
         This method constructs a new function that is specifically written 
-        to format a name given a particualar format string. This is worthwhile
+        to format a name given a particular format string. This is worthwhile
         because the format string itself rarely changes, so by caching the new
         function and calling it directly when asked to format a name to the
         same format string again we can be as quick as possible.
@@ -571,7 +575,6 @@ def fn(%s):
         return self.name_formats[num][_F_FN](name)
 
     def display_given(self, person):
-        name = person.get_primary_name()
         return self.format_str(person.get_primary_name(),'%f %y')
 
     def name_grouping(self, db, person):

src/QuestionDialog.py

@@ -26,7 +26,6 @@
 #
 #-------------------------------------------------------------------------
 from gettext import gettext as _
-import os
 
 #-------------------------------------------------------------------------
 #
@@ -326,8 +325,8 @@ class MessageHideDialog(object):
         self.xml = Glade(toplevel='hidedialog')
               
         self.top = self.xml.toplevel
-        top.set_icon(ICON)
-        top.set_title("%s - GRAMPS" % title)
+        self.top.set_icon(ICON)
+        self.top.set_title("%s - GRAMPS" % title)
 
         dont_show = self.xml.get_object('dont_show')
         dont_show.set_active(Config.get(key))
@@ -339,8 +338,8 @@ class MessageHideDialog(object):
         self.xml.get_object('message').set_text(message)
         
         dont_show.connect('toggled', self.update_checkbox, key)
-        top.run()
-        top.destroy()
+        self.top.run()
+        self.top.destroy()
 
     def update_checkbox(self, obj, constant):
         Config.set(constant, obj.get_active())

src/gen/lib/researcher.py

@@ -21,7 +21,7 @@
 # $Id$
 
 """
-Researcher informaiton for GRAMPS.
+Researcher information for GRAMPS.
 """
 
 #-------------------------------------------------------------------------