From 4053d84a5f0b9a461ebb4f903c0d59979a20a860 Mon Sep 17 00:00:00 2001 From: Tom Samstag Date: Wed, 30 Dec 2015 22:09:13 -0800 Subject: [PATCH 1/5] fix a raising of NotImplemented It may not have caused any issues, but changing this from raising NotImplemented to a NotImplementedError. Explanation about why this is important at: http://mouadino.appspot.com/notimpelementederror-vs-notimplemented-in-python/ --- gramps/plugins/lib/libgedcom.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gramps/plugins/lib/libgedcom.py b/gramps/plugins/lib/libgedcom.py index 6c7719775..50e73d420 100644 --- a/gramps/plugins/lib/libgedcom.py +++ b/gramps/plugins/lib/libgedcom.py @@ -1238,7 +1238,7 @@ class BaseReader(object): self.ifile.seek(0) def readline(self): - raise NotImplemented + raise NotImplementedError() def report_error(self, problem, line): line = line.rstrip('\n\r') From de8d8370e3f2b1d26fac64dfbb1f1b4d734d8aad Mon Sep 17 00:00:00 2001 From: Tom Samstag Date: Wed, 30 Dec 2015 22:46:57 -0800 Subject: [PATCH 2/5] fixing else clauses on loops --- gramps/gen/filters/rules/person/_regexpname.py | 3 +-- gramps/gen/filters/rules/person/_searchname.py | 3 +-- gramps/gen/lib/person.py | 15 +++++++-------- gramps/gui/glade.py | 4 ++-- gramps/gui/plug/export/_exportassistant.py | 3 +-- gramps/plugins/tool/mediamanager.py | 4 ++-- 6 files changed, 14 insertions(+), 18 deletions(-) diff --git a/gramps/gen/filters/rules/person/_regexpname.py b/gramps/gen/filters/rules/person/_regexpname.py index d4a8a76c9..83b6d6e55 100644 --- a/gramps/gen/filters/rules/person/_regexpname.py +++ b/gramps/gen/filters/rules/person/_regexpname.py @@ -55,5 +55,4 @@ class RegExpName(Rule): name.title, name.nick, name.famnick, name.call]: if self.match_substring(0, field): return True - else: - return False + return False diff --git a/gramps/gen/filters/rules/person/_searchname.py b/gramps/gen/filters/rules/person/_searchname.py index e19821d4b..16b0dbd5c 100644 --- a/gramps/gen/filters/rules/person/_searchname.py +++ b/gramps/gen/filters/rules/person/_searchname.py @@ -57,5 +57,4 @@ class SearchName(Rule): name.title, name.nick, name.famnick, name.call]: if src and field.upper().find(src) != -1: return True - else: - return False + return False diff --git a/gramps/gen/lib/person.py b/gramps/gen/lib/person.py index 6aebb082a..0f66f09e3 100644 --- a/gramps/gen/lib/person.py +++ b/gramps/gen/lib/person.py @@ -692,8 +692,7 @@ class Person(CitationBase, NoteBase, AttributeBase, MediaBase, for attr in self.attribute_list: if int(attr.type) == AttributeType.NICKNAME: return attr.get_value() - else: - return '' + return '' def set_gender(self, gender) : """ @@ -743,9 +742,9 @@ class Person(CitationBase, NoteBase, AttributeBase, MediaBase, for self.birth_ref_index, ref in enumerate(self.event_ref_list): if event_ref.is_equal(ref): return # Note: self.birth_ref_index already set - else: - self.event_ref_list.append(event_ref) - self.birth_ref_index = len(self.event_ref_list)-1 + + self.event_ref_list.append(event_ref) + self.birth_ref_index = len(self.event_ref_list)-1 def set_death_ref(self, event_ref): """ @@ -768,9 +767,9 @@ class Person(CitationBase, NoteBase, AttributeBase, MediaBase, for self.death_ref_index, ref in enumerate(self.event_ref_list): if event_ref.is_equal(ref): return # Note: self.death_ref_index already set - else: - self.event_ref_list.append(event_ref) - self.death_ref_index = len(self.event_ref_list)-1 + + self.event_ref_list.append(event_ref) + self.death_ref_index = len(self.event_ref_list)-1 def get_birth_ref(self): """ diff --git a/gramps/gui/glade.py b/gramps/gui/glade.py index fac78464b..fe99f9c4e 100644 --- a/gramps/gui/glade.py +++ b/gramps/gui/glade.py @@ -214,5 +214,5 @@ class Glade(Gtk.Builder): return obj if hasattr(obj, 'get_children'): queue += obj.get_children() - else: - return None + + return None diff --git a/gramps/gui/plug/export/_exportassistant.py b/gramps/gui/plug/export/_exportassistant.py index 3a2964284..5e70c1c29 100644 --- a/gramps/gui/plug/export/_exportassistant.py +++ b/gramps/gui/plug/export/_exportassistant.py @@ -549,8 +549,7 @@ class ExportAssistant(Gtk.Assistant, ManagedWindow) : button = self.format_buttons[ix] if button.get_active(): return ix - else: - return 0 + return 0 def suggest_filename(self): """Prepare suggested filename and set it in the file chooser.""" diff --git a/gramps/plugins/tool/mediamanager.py b/gramps/plugins/tool/mediamanager.py index b5bfde06f..dc2d4c0ff 100644 --- a/gramps/plugins/tool/mediamanager.py +++ b/gramps/plugins/tool/mediamanager.py @@ -275,8 +275,8 @@ class SelectionPage(Gtk.Box): button = self.batch_op_buttons[index] if button.get_active(): return index - else: - return 0 + + return 0 class SettingsPage(Gtk.Box): """ From 602ad1bc530b58970e82214755b527805300545a Mon Sep 17 00:00:00 2001 From: Tom Samstag Date: Thu, 31 Dec 2015 00:03:22 -0800 Subject: [PATCH 3/5] not x is None -> x is not None --- gramps/gen/utils/callman.py | 2 +- gramps/gui/editors/displaytabs/embeddedlist.py | 2 +- gramps/gui/editors/displaytabs/eventembedlist.py | 2 +- gramps/gui/editors/displaytabs/nameembedlist.py | 2 +- gramps/plugins/quickview/all_relations.py | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gramps/gen/utils/callman.py b/gramps/gen/utils/callman.py index e021854f6..aca693047 100644 --- a/gramps/gen/utils/callman.py +++ b/gramps/gen/utils/callman.py @@ -295,7 +295,7 @@ class CallbackManager(object): unconnect a signal from the database if it is already connected """ oldcall, oldconnectkey = self.__callbacks[signal] - if not oldconnectkey is None: + if oldconnectkey is not None: self.database.disconnect(oldconnectkey) def add_db_signal(self, name, callback): diff --git a/gramps/gui/editors/displaytabs/embeddedlist.py b/gramps/gui/editors/displaytabs/embeddedlist.py index 83ba21c22..86d0ead2c 100644 --- a/gramps/gui/editors/displaytabs/embeddedlist.py +++ b/gramps/gui/editors/displaytabs/embeddedlist.py @@ -581,7 +581,7 @@ class EmbeddedList(ButtonTab): self.tree.set_model(self.model) #reset previous select - if not selectedpath is None: + if selectedpath is not None: self.selection.select_path(selectedpath) #self.selection.select_path(node) self._set_label() diff --git a/gramps/gui/editors/displaytabs/eventembedlist.py b/gramps/gui/editors/displaytabs/eventembedlist.py index 9a7dc90f3..fb6c6c828 100644 --- a/gramps/gui/editors/displaytabs/eventembedlist.py +++ b/gramps/gui/editors/displaytabs/eventembedlist.py @@ -413,5 +413,5 @@ class EventEmbedList(DbGUIElement, GroupEmbeddedList): @type prebuildpath: tree path """ self.tree.expand_all() - if not prebuildpath is None: + if prebuildpath is not None: self.selection.select_path(prebuildpath) diff --git a/gramps/gui/editors/displaytabs/nameembedlist.py b/gramps/gui/editors/displaytabs/nameembedlist.py index d919ea22b..bc6947520 100644 --- a/gramps/gui/editors/displaytabs/nameembedlist.py +++ b/gramps/gui/editors/displaytabs/nameembedlist.py @@ -219,5 +219,5 @@ class NameEmbedList(GroupEmbeddedList): @type prebuildpath: tree path """ self.tree.expand_all() - if not prebuildpath is None: + if prebuildpath is not None: self.selection.select_path(prebuildpath) diff --git a/gramps/plugins/quickview/all_relations.py b/gramps/plugins/quickview/all_relations.py index ab44b9f17..99654163d 100644 --- a/gramps/plugins/quickview/all_relations.py +++ b/gramps/plugins/quickview/all_relations.py @@ -234,7 +234,7 @@ class AllRelReport(): relation[4], relation[2], only_birth = birth, in_law_a = inlawa, in_law_b = inlawb) - if not skip_list_text is None: + if skip_list_text is not None: if rel_str in skip_list_text: skip_list.append(count) else: From e9eedee5c647eeacd6b77a44ffae3180d013ba83 Mon Sep 17 00:00:00 2001 From: Tom Samstag Date: Thu, 31 Dec 2015 00:08:42 -0800 Subject: [PATCH 4/5] change tabs to spaces --- gramps/gen/plug/utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gramps/gen/plug/utils.py b/gramps/gen/plug/utils.py index 93615dad9..255bbb299 100644 --- a/gramps/gen/plug/utils.py +++ b/gramps/gen/plug/utils.py @@ -214,7 +214,7 @@ def available_updates(): fp = urlopen_maybe_no_check_cert(URL) except Exception as err: # some error LOG.warning("Failed to open addon metadata for {lang} {url}: {err}". - format(lang=lang, url=URL, err=err)) + format(lang=lang, url=URL, err=err)) fp = None if fp and fp.getcode() == 200: # ok break From 92c2ddc33ec87a132c19b3ff5dd9efbfdb54bc81 Mon Sep 17 00:00:00 2001 From: Tom Samstag Date: Thu, 31 Dec 2015 00:24:07 -0800 Subject: [PATCH 5/5] remove unnecessary pass statements --- gramps/gen/filters/_filterlist.py | 1 - gramps/gen/utils/docgen/odstab.py | 4 ---- gramps/gui/displaystate.py | 2 +- gramps/plugins/lib/maps/geography.py | 3 --- gramps/plugins/webreport/narrativeweb.py | 2 -- 5 files changed, 1 insertion(+), 11 deletions(-) diff --git a/gramps/gen/filters/_filterlist.py b/gramps/gen/filters/_filterlist.py index 745cb54f0..958016bb0 100644 --- a/gramps/gen/filters/_filterlist.py +++ b/gramps/gen/filters/_filterlist.py @@ -108,7 +108,6 @@ class FilterList(object): the_file.close() except (IOError, OSError): print("IO/OSError in _filterlist.py") - pass except SAXParseException: print("Parser error") diff --git a/gramps/gen/utils/docgen/odstab.py b/gramps/gen/utils/docgen/odstab.py index 1a724b5a2..6f8229af9 100644 --- a/gramps/gen/utils/docgen/odstab.py +++ b/gramps/gen/utils/docgen/odstab.py @@ -425,7 +425,6 @@ class ODSTab(TabbedDoc): errmsg = "%s\n%s" % (_("Could not create %s") % self.styles_xml, msg) raise ReportError(errmsg) except: - pass raise ReportError(_("Could not create %s") % self.styles_xml) self.f = open(self.styles_xml,"w") @@ -460,7 +459,6 @@ class ODSTab(TabbedDoc): errmsg = "%s\n%s" % (_("Could not create %s") % self.manifest_xml, msg) raise ReportError(errmsg) except: - pass raise ReportError(_("Could not create %s") % self.manifest_xml) self.f = open(self.manifest_xml,"w") @@ -476,7 +474,6 @@ class ODSTab(TabbedDoc): errmsg = "%s\n%s" % (_("Could not create %s") % self.meta_xml, msg) raise ReportError(errmsg) except: - pass raise ReportError(_("Could not create %s") % self.meta_xml) self.f = open(self.meta_xml,"w") @@ -499,7 +496,6 @@ class ODSTab(TabbedDoc): errmsg = "%s\n%s" % (_("Could not create %s") % self.mimetype, msg) raise ReportError(errmsg) except: - pass raise ReportError(_("Could not create %s") % self.mimetype) self.f = open(self.mimetype,"w") diff --git a/gramps/gui/displaystate.py b/gramps/gui/displaystate.py index 69edab7b6..c6117a5e7 100644 --- a/gramps/gui/displaystate.py +++ b/gramps/gui/displaystate.py @@ -296,8 +296,8 @@ class RecentDocsMenu(object): mitem.show() new_menu.append(mitem) except RuntimeError: + # ignore no longer existing files _LOG.info("Ignoring the RecentItem %s (%s)" % (title, filename)) - pass # ignore no longer existing files count += 1 buf.write(_RCT_BTM) diff --git a/gramps/plugins/lib/maps/geography.py b/gramps/plugins/lib/maps/geography.py index d84a7e9a2..7b509c241 100644 --- a/gramps/plugins/lib/maps/geography.py +++ b/gramps/plugins/lib/maps/geography.py @@ -404,7 +404,6 @@ class GeoGraphyView(OsmGps, NavigationView): path = "%s%c%s" % ( config.get('geography.path'), os.sep, the_map ) shutil.rmtree(path) - pass def add_specific_menu(self, menu, event, lat, lon): """ @@ -1110,7 +1109,6 @@ class GeoGraphyView(OsmGps, NavigationView): else: config.set("geography.lock", True) self.lock = config.get("geography.lock") - pass def config_crosshair(self, client, cnxn_id, entry, data): """ @@ -1121,7 +1119,6 @@ class GeoGraphyView(OsmGps, NavigationView): else: config.set("geography.show_cross", True) self.set_crosshair(config.get("geography.show_cross")) - pass def specific_options(self, configdialog): """ diff --git a/gramps/plugins/webreport/narrativeweb.py b/gramps/plugins/webreport/narrativeweb.py index f01012e61..93c7e5f87 100644 --- a/gramps/plugins/webreport/narrativeweb.py +++ b/gramps/plugins/webreport/narrativeweb.py @@ -3371,7 +3371,6 @@ class PlacePages(BasePage): for place_handle in self.report.obj_dict[Place]: step() self.PlacePage(self.report, title, place_handle) - pass def PlaceListPage(self, report, title, place_handles): self.dbase_ = report.database @@ -6613,7 +6612,6 @@ class RepositoryPages(BasePage): def __init__(self, report): self.repos_dict = defaultdict(set) self.report = report - pass def display_pages(self, title): """