diff --git a/ChangeLog b/ChangeLog index 21990eca0..2bbfebe11 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2008-01-19 Gary Burton + * src/GrampsDbUtils/_ReadXML.py: Remove print debugging statements + +2008-01-19 Gary Burton + * src/DbManager.py: Fix date regular expression used to find rcs + revisions also found in Bug #1622 + +2008-01-19 Douglas S. Blank + * src/DbManager.py: Test for missing path. Bug #1622 + 2008-01-18 Douglas S. Blank * src/plugins/ImportCSV.py (cleanup_column_name): use given, givenname as aliases for firstname; diff --git a/src/DbManager.py b/src/DbManager.py index 68ba104ff..139a8988a 100644 --- a/src/DbManager.py +++ b/src/DbManager.py @@ -338,7 +338,10 @@ class DbManager(CLIDbManager): self.repair.hide() self.remove.set_sensitive(False) else: - is_rev = len(self.model.get_path(node)) > 1 + path = self.model.get_path(node) + if path == None: + return + is_rev = len(path) > 1 self.rcs.set_label(RCS_BUTTON[is_rev]) self.rename.set_sensitive(True) @@ -914,7 +917,7 @@ def find_revisions(name): import re rev = re.compile("\s*revision\s+([\d\.]+)") - date = re.compile("date:\s+(\d\d\d\d-\d\d-\d\d \d\d:\d\d:\d\d)-\d\d;") + date = re.compile("date:\s+(\d\d\d\d-\d\d-\d\d \d\d:\d\d:\d\d)[-+]\d\d;") if not os.path.isfile(name): return [] diff --git a/src/GrampsDbUtils/_ReadXML.py b/src/GrampsDbUtils/_ReadXML.py index b9c634925..2300fa9fe 100644 --- a/src/GrampsDbUtils/_ReadXML.py +++ b/src/GrampsDbUtils/_ReadXML.py @@ -757,7 +757,6 @@ class GrampsParser(UpdateCallback): # GRAMPS LEGACY: title in the placeobj tag self.placeobj.title = attrs.get('title', '') - print attrs.get('ptitle') self.locations = 0 self.update(self.p.CurrentLineNumber) @@ -1726,7 +1725,6 @@ class GrampsParser(UpdateCallback): def stop_ptitle(self, tag): self.placeobj.title = tag - print tag def stop_placeobj(self, *tag): if self.placeobj.title == "":