From cf5ee9d6576cf6710af47e782c6e9bfdb66dfebe Mon Sep 17 00:00:00 2001 From: Raphael Ackermann Date: Fri, 14 Aug 2009 07:07:10 +0000 Subject: [PATCH] pep8 & typos svn: r13001 --- src/BasicUtils/_NameDisplay.py | 99 +++++++++++++++++----------------- src/QuestionDialog.py | 31 ++++++----- src/gen/lib/researcher.py | 2 +- 3 files changed, 67 insertions(+), 65 deletions(-) diff --git a/src/BasicUtils/_NameDisplay.py b/src/BasicUtils/_NameDisplay.py index 21b863f45..e4ebad266 100644 --- a/src/BasicUtils/_NameDisplay.py +++ b/src/BasicUtils/_NameDisplay.py @@ -79,7 +79,7 @@ _F_RAWFN = 4 # name format raw function # #------------------------------------------------------------------------- # Because of occurring in an exec(), this couldn't be in a lambda: -def _make_cmp(a,b): return -cmp(a[1], b[1]) +def _make_cmp(a, b): return -cmp(a[1], b[1]) #------------------------------------------------------------------------- # @@ -116,19 +116,19 @@ class NameDisplay(object): self.default_format = Config.get(Config.NAME_FORMAT) if self.default_format == 0: self.default_format = Name.LNFN - Config.set(Config.NAME_FORMAT,self.default_format) + Config.set(Config.NAME_FORMAT, self.default_format) else: self.default_format = 1 self.set_default_format(self.default_format) - def _format_fn(self,fmt_str): - return lambda x: self.format_str(x,fmt_str) + def _format_fn(self, fmt_str): + return lambda x: self.format_str(x, fmt_str) - def _format_raw_fn(self,fmt_str): - return lambda x: self.format_str_raw(x,fmt_str) + def _format_raw_fn(self, fmt_str): + return lambda x: self.format_str_raw(x, fmt_str) - def _raw_lnfn(self,raw_data): + def _raw_lnfn(self, raw_data): result = "%s %s, %s %s %s" % (raw_data[_PREFIX], raw_data[_SURNAME], raw_data[_FIRSTNAME], @@ -136,7 +136,7 @@ class NameDisplay(object): raw_data[_SUFFIX]) return ' '.join(result.split()) - def _raw_fnln(self,raw_data): + def _raw_fnln(self, raw_data): result = "%s %s %s %s %s" % (raw_data[_FIRSTNAME], raw_data[_PATRONYM], raw_data[_PREFIX], @@ -144,18 +144,18 @@ class NameDisplay(object): raw_data[_SUFFIX]) return ' '.join(result.split()) - def _raw_ptfn(self,raw_data): + def _raw_ptfn(self, raw_data): result = "%s %s, %s %s" % (raw_data[_PREFIX], raw_data[_PATRONYM], raw_data[_SUFFIX], raw_data[_FIRSTNAME]) return ' '.join(result.split()) - def _raw_fn(self,raw_data): + def _raw_fn(self, raw_data): result = raw_data[_FIRSTNAME] return ' '.join(result.split()) - def set_name_format(self,formats): + def set_name_format(self, formats): raw_func_dict = { Name.LNFN : self._raw_lnfn, Name.FNLN : self._raw_fnln, @@ -163,22 +163,22 @@ class NameDisplay(object): Name.FN : self._raw_fn, } - for (num, name,fmt_str,act) in formats: + for (num, name, fmt_str, act) in formats: func = self._format_fn(fmt_str) func_raw = raw_func_dict.get(num) if func_raw is None: func_raw = self._format_raw_fn(fmt_str) - self.name_formats[num] = (name,fmt_str,act,func,func_raw) + self.name_formats[num] = (name, fmt_str, act, func, func_raw) - def add_name_format(self, name,fmt_str): + def add_name_format(self, name, fmt_str): num = -1 while num in self.name_formats: num -= 1 - self.set_name_format([(num, name,fmt_str,_ACT)]) + self.set_name_format([(num, name, fmt_str,_ACT)]) return num - def edit_name_format(self, num, name,fmt_str): - self.set_name_format([(num, name,fmt_str,_ACT)]) + def edit_name_format(self, num, name, fmt_str): + self.set_name_format([(num, name, fmt_str,_ACT)]) if self.default_format == num: self.set_default_format(num) @@ -213,7 +213,7 @@ class NameDisplay(object): except: pass - def get_name_format(self,also_default=False, + def get_name_format(self, also_default=False, only_custom=False, only_active=True): """ @@ -231,13 +231,17 @@ class NameDisplay(object): return the_list - def _sort_name_format(self,x,y): - if x<0: - if y<0: return x+y - else: return -x+y + def _sort_name_format(self, x, y): + if x < 0: + if y < 0: + return x+y + else: + return -x+y else: - if y<0: return -x+y - else: return x-y + 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. @@ -349,9 +353,9 @@ class NameDisplay(object): for (code, ikeyword) in d_keys: exp, keyword, ikeyword = d[code] ikeyword = unicode(ikeyword, "utf8") - format_str = format_str.replace(ikeyword,"%"+ code) - format_str = format_str.replace(ikeyword.title(),"%"+ code) - format_str = format_str.replace(ikeyword.upper(),"%"+ code.upper()) + format_str = format_str.replace(ikeyword, "%"+ code) + format_str = format_str.replace(ikeyword.title(), "%"+ code) + format_str = format_str.replace(ikeyword.upper(), "%"+ code.upper()) # Next, go through and do key-word replacement. # Just replace keywords with # %codes (ie, replace "firstname" with "%f", and @@ -366,9 +370,9 @@ class NameDisplay(object): for (code, keyword) in d_keys: exp, keyword, ikeyword = d[code] keyword = unicode(keyword, "utf8") - format_str = format_str.replace(keyword,"%"+ code) - format_str = format_str.replace(keyword.title(),"%"+ code) - format_str = format_str.replace(keyword.upper(),"%"+ code.upper()) + format_str = format_str.replace(keyword, "%"+ code) + format_str = format_str.replace(keyword.title(), "%"+ code) + format_str = format_str.replace(keyword.upper(), "%"+ code.upper()) # Get lower and upper versions of codes: codes = d.keys() + [c.upper() for c in d] # Next, list out the matching patterns: @@ -408,8 +412,8 @@ class NameDisplay(object): if p == '' and s == '': param = param + (field,) else: - param = param + ("ifNotEmpty(%s,'%s','%s')" % (field,p,s), ) - mat = pat.search(format_str,mat.end()) + param = param + ("ifNotEmpty(%s,'%s','%s')" % (field, p, s), ) + mat = pat.search(format_str, mat.end()) s = """ def fn(%s): def ifNotEmpty(str,p,s): @@ -422,12 +426,12 @@ def fn(%s): return fn - def format_str(self, name,format_str): + def format_str(self, name, format_str): return self._format_str_base(name.first_name, name.surname, name.prefix, name.suffix, name.patronymic, name.title, name.call,format_str) - def format_str_raw(self,raw_data,format_str): + def format_str_raw(self, raw_data, format_str): """ Format a name from the raw name list. To make this as fast as possible this uses _gen_raw_func to generate a new method for each new format_string. @@ -444,8 +448,8 @@ def fn(%s): return ' '.join(s.split()) - def _format_str_base(self,first,surname,prefix,suffix,patronymic, - title,call,format_str): + def _format_str_base(self, first, surname, prefix, suffix, patronymic, + title, call, format_str): """ Generates name from a format string. @@ -469,7 +473,7 @@ def fn(%s): self.__class__.format_funcs[format_str] = func try: s = func(first,surname,prefix,suffix,patronymic,title,call) - except (ValueError,TypeError,): + except (ValueError, TypeError,): raise NameDisplayError, "Incomplete format string" return ' '.join(s.split()) @@ -479,7 +483,7 @@ def fn(%s): def sort_string(self, name): return u"%-25s%-30s%s" % (name.surname, name.first_name, name.suffix) - def sorted(self,person): + def sorted(self, person): """ Return a text string representing the L{gen.lib.Person} instance's L{Name} in a manner that should be used for displaying a sorted @@ -509,7 +513,7 @@ def fn(%s): num = self._is_format_valid(name.sort_as) return self.name_formats[num][_F_FN](name) - def raw_sorted_name(self,raw_data): + def raw_sorted_name(self, raw_data): """ Return a text string representing the L{Name} instance in a manner that should be used for displaying a sorted @@ -523,7 +527,7 @@ def fn(%s): num = self._is_format_valid(raw_data[_SORT]) return self.name_formats[num][_F_RAWFN](raw_data) - def display(self,person): + def display(self, person): """ Return a text string representing the L{gen.lib.Person} instance's L{Name} in a manner that should be used for normal displaying. @@ -538,7 +542,7 @@ def fn(%s): name = person.get_primary_name() return self.display_name(name) - def display_formal(self,person): + def display_formal(self, person): """ Return a text string representing the L{gen.lib.Person} instance's L{Name} in a manner that should be used for normal displaying. @@ -570,14 +574,13 @@ def fn(%s): num = self._is_format_valid(name.display_as) return self.name_formats[num][_F_FN](name) - def display_given(self,person): - name = person.get_primary_name() + def display_given(self, person): return self.format_str(person.get_primary_name(),'%f %y') - def name_grouping(self,db,person): - return self.name_grouping_name(db,person.primary_name) + def name_grouping(self, db, person): + return self.name_grouping_name(db, person.primary_name) - def name_grouping_name(self,db,pn): + def name_grouping_name(self, db, pn): if pn.group_as: return pn.group_as sv = pn.sort_as diff --git a/src/QuestionDialog.py b/src/QuestionDialog.py index 30c1d477b..714579e18 100644 --- a/src/QuestionDialog.py +++ b/src/QuestionDialog.py @@ -26,7 +26,6 @@ # #------------------------------------------------------------------------- from gettext import gettext as _ -import os #------------------------------------------------------------------------- # @@ -51,7 +50,7 @@ except: ICON = None class SaveDialog(object): - def __init__(self,msg1,msg2,task1,task2,parent=None): + def __init__(self, msg1, msg2, task1, task2, parent=None): self.xml = Glade(toplevel='savedialog') self.top = self.xml.toplevel @@ -78,11 +77,11 @@ class SaveDialog(object): elif response == gtk.RESPONSE_YES: self.task2() - Config.set(Config.DONT_ASK,self.dontask.get_active()) + Config.set(Config.DONT_ASK, self.dontask.get_active()) self.top.destroy() class QuestionDialog(object): - def __init__(self,msg1,msg2,label,task,parent=None): + def __init__(self, msg1, msg2, label, task, parent=None): self.xml = Glade(toplevel='questiondialog') self.top = self.xml.toplevel @@ -108,7 +107,7 @@ class QuestionDialog(object): task() class QuestionDialog2(object): - def __init__(self,msg1,msg2,label_msg1,label_msg2,parent=None): + def __init__(self, msg1, msg2, label_msg1, label_msg2, parent=None): self.xml = Glade(toplevel='questiondialog') self.top = self.xml.toplevel @@ -138,7 +137,7 @@ class QuestionDialog2(object): return (response == gtk.RESPONSE_ACCEPT) class OptionDialog(object): - def __init__(self,msg1,msg2,btnmsg1,task1,btnmsg2,task2,parent=None): + def __init__(self, msg1, msg2, btnmsg1, task1, btnmsg2, task2, parent=None): self.xml = Glade(toplevel='optiondialog') self.top = self.xml.toplevel @@ -171,7 +170,7 @@ class OptionDialog(object): return self.response class ErrorDialog(gtk.MessageDialog): - def __init__(self,msg1,msg2="",parent=None): + def __init__(self, msg1, msg2="", parent=None): gtk.MessageDialog.__init__(self, parent, flags=gtk.DIALOG_MODAL, @@ -207,7 +206,7 @@ class DBErrorDialog(ErrorDialog): 'click on the Repair button') + '\n\n' + str(msg), parent) class WarningDialog(gtk.MessageDialog): - def __init__(self,msg1,msg2="",parent=None): + def __init__(self, msg1, msg2="", parent=None): gtk.MessageDialog.__init__(self, parent, flags=gtk.DIALOG_MODAL, @@ -222,7 +221,7 @@ class WarningDialog(gtk.MessageDialog): self.destroy() class OkDialog(gtk.MessageDialog): - def __init__(self,msg1,msg2="",parent=None): + def __init__(self, msg1, msg2="", parent=None): gtk.MessageDialog.__init__(self, parent, flags=gtk.DIALOG_MODAL, @@ -267,7 +266,7 @@ class InfoDialog(object): return self.response class MissingMediaDialog(object): - def __init__(self,msg1,msg2,task1,task2,task3,parent=None): + def __init__(self, msg1, msg2, task1, task2, task3, parent=None): self.xml = Glade(toplevel='missmediadialog') self.top = self.xml.toplevel @@ -291,7 +290,7 @@ class MissingMediaDialog(object): if parent: self.top.set_transient_for(parent) self.top.show() - self.top.connect('delete_event',self.warn) + self.top.connect('delete_event', self.warn) response = gtk.RESPONSE_DELETE_EVENT # Need some magic here, because an attempt to close the dialog @@ -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)) @@ -338,9 +337,9 @@ class MessageHideDialog(object): self.xml.get_object('message').set_text(message) - dont_show.connect('toggled',self.update_checkbox, key) - top.run() - top.destroy() + dont_show.connect('toggled', self.update_checkbox, key) + self.top.run() + self.top.destroy() def update_checkbox(self, obj, constant): Config.set(constant, obj.get_active()) diff --git a/src/gen/lib/researcher.py b/src/gen/lib/researcher.py index 436bf57f8..78b5afe39 100644 --- a/src/gen/lib/researcher.py +++ b/src/gen/lib/researcher.py @@ -21,7 +21,7 @@ # $Id$ """ -Researcher informaiton for GRAMPS. +Researcher information for GRAMPS. """ #-------------------------------------------------------------------------