* src/RelLib.py (Event.are_equal): Only compare place handles if

at least one if them is non-empty.


svn: r3935
This commit is contained in:
Alex Roitman 2005-01-19 03:31:48 +00:00
parent 114ee7f12e
commit 15491e3ad5
2 changed files with 4 additions and 1 deletions

View File

@ -29,6 +29,8 @@
* src/dates/Date_ru.py: Add formats and quality. * src/dates/Date_ru.py: Add formats and quality.
* src/EditPerson.py (get_place): Use "" for empty place's handle. * src/EditPerson.py (get_place): Use "" for empty place's handle.
* src/RelLib.py (Event.are_equal): Only compare place handles if
at least one if them is non-empty.
2005-01-17 Don Allingham <dallingham@users.sourceforge.net> 2005-01-17 Don Allingham <dallingham@users.sourceforge.net>
* src/ReportUtils.py: Added * src/ReportUtils.py: Added

View File

@ -1548,7 +1548,8 @@ class Event(PrimaryObject,DataObj):
""" """
if other == None: if other == None:
other = Event (None) other = Event (None)
if (self.name != other.name or self.place != other.place or if (self.name != other.name or
((self.place or other.place) and (self.place != other.place)) or
self.description != other.description or self.cause != other.cause or self.description != other.description or self.cause != other.cause or
self.private != other.private or self.private != other.private or
(not self.get_date_object().is_equal(other.get_date_object())) or (not self.get_date_object().is_equal(other.get_date_object())) or