From 8e5801b970f09fa1039dfe16b4a47c4d12ded0b2 Mon Sep 17 00:00:00 2001 From: Don Allingham Date: Thu, 30 Oct 2003 04:18:17 +0000 Subject: [PATCH] pychecker fixes svn: r2294 --- gramps2/ChangeLog | 15 +++++++++++++++ gramps2/NEWS | 2 ++ gramps2/src/Calendar.py | 2 +- gramps2/src/GenericFilter.py | 8 ++------ gramps2/src/Marriage.py | 1 - gramps2/src/Sources.py | 1 - gramps2/src/StyleEditor.py | 1 - 7 files changed, 20 insertions(+), 10 deletions(-) diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog index 36bfb6baf..95f701658 100644 --- a/gramps2/ChangeLog +++ b/gramps2/ChangeLog @@ -1,3 +1,18 @@ +2003-10-29 Don Allingham + * src/gramps_main.py: pychecker cleanup + * src/PeopleView.py: pychecker cleanup + * src/PeopleStore.py: pychecker cleanup + * src/EditPerson.py: pychecker cleanup + * src/QuickAdd.py: remove file + * src/SelectChild.py: Remove ability to add new person, since a separate + function for this already exists. + * src/gramps.glade: remvoe add button from select child dialog + * src/Makefile.am: remove QuickAdd.py + * src/intl.py: remove + * src/intl.c: remove + * src/TextDoc.py: remove + * src/DrawDoc.py: remove + 2003-10-28 Don Allingham * src/RelLib.py: Person and Family now inherit from SourceNote * src/EditPerson.py: Added source tab to apply generic sources diff --git a/gramps2/NEWS b/gramps2/NEWS index c80baef66..7793661fc 100644 --- a/gramps2/NEWS +++ b/gramps2/NEWS @@ -8,6 +8,8 @@ Version 0.98.0 * When choosing parents, select the spouse of the first selected person to make picking a family quicker. * Instant preferences. +* People and Relationships can now have sources not associated with any + event * Bugfixes. Version 0.9.5 -- the "Fix me up" release diff --git a/gramps2/src/Calendar.py b/gramps2/src/Calendar.py index 99a3d0032..a56937baa 100644 --- a/gramps2/src/Calendar.py +++ b/gramps2/src/Calendar.py @@ -151,7 +151,7 @@ class Calendar: try: return unicode(Calendar.MONTHS[val-1]) except: - return "Illegal Month" + return u'Illegal Month' def check(self,year,month,day): return 1 diff --git a/gramps2/src/GenericFilter.py b/gramps2/src/GenericFilter.py index 0fa950f66..f6458039f 100644 --- a/gramps2/src/GenericFilter.py +++ b/gramps2/src/GenericFilter.py @@ -51,7 +51,6 @@ import const import RelLib import Date import Calendar -import Errors from gettext import gettext as _ from Utils import for_each_ancestor @@ -83,7 +82,7 @@ class Rule: labels = [] def __init__(self,list): - assert(type(list) == type([]),"Argument is not a list") + assert type(list) == type([]), "Argument is not a list" self.list = list def values(self): @@ -790,10 +789,7 @@ class IsParentOfFilterMatch(Rule): return self.map.has_key(p.getId()) def init_list(self,p): -# if self.map.has_key(p.getId()) == 1: -# loop_error(self.orig,p) - fam in p.getMainParents() - if fam: + if fam in p.getMainParents(): for parent in [fam.getFather (), fam.getMother ()]: if parent: self.map[parent.getId()] = 1 diff --git a/gramps2/src/Marriage.py b/gramps2/src/Marriage.py index 72e9af11e..ae072debc 100644 --- a/gramps2/src/Marriage.py +++ b/gramps2/src/Marriage.py @@ -242,7 +242,6 @@ class Marriage: self.seal_stat = obj.get_data("val") def lds_src_clicked(self,obj): - import Sources ord = self.family.getLdsSeal() if ord == None: ord = RelLib.LdsOrd() diff --git a/gramps2/src/Sources.py b/gramps2/src/Sources.py index df19c9c6a..a072cbd7b 100644 --- a/gramps2/src/Sources.py +++ b/gramps2/src/Sources.py @@ -379,7 +379,6 @@ class SourceEditor: def add_src_clicked(self,obj): import EditSource - import RelLib EditSource.EditSource(RelLib.Source(),self.db, self.sourceDisplay, self.update_display) diff --git a/gramps2/src/StyleEditor.py b/gramps2/src/StyleEditor.py index 0ccaae432..868d88e20 100644 --- a/gramps2/src/StyleEditor.py +++ b/gramps2/src/StyleEditor.py @@ -30,7 +30,6 @@ __version__ = "$Revision$" # GNOME/GTK modules # #------------------------------------------------------------------------ -import gobject import gtk #------------------------------------------------------------------------