Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Code optimizations wrt handling of None - bug 2212

Browse Source 
svn: r10811
This commit is contained in:
Gerald Britton
2008-06-16 15:01:46 +00:00
parent 47095b4e98
commit 4982292774
124 changed files with 379 additions and 377 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/ReportBase/_Bibliography.py
View File

@@ -187,11 +187,11 @@ class Bibliography:
return True
if ( self.mode & self.MODE_DATE ) == self.MODE_DATE:
date = source_ref.get_date_object()
if date != None and not date.is_empty():
if date is not None and not date.is_empty():
return True
if ( self.mode & self.MODE_CONF ) == self.MODE_CONF:
confidence = source_ref.get_confidence_level()
if confidence != None and confidence != SourceRef.CONF_NORMAL:
if confidence is not None and confidence != SourceRef.CONF_NORMAL:
return True
if ( self.mode & self.MODE_NOTE ) == self.MODE_NOTE:
if len(source_ref.get_note_list()) != 0:

2
src/ReportBase/_DocReportDialog.py
View File

@@ -165,7 +165,7 @@ class DocReportDialog(ReportDialog):
self.row += 1
ext = self.format_menu.get_ext()
if ext == None:
if ext is None:
ext = ""
else:
spath = self.get_default_directory()

2
src/ReportBase/_Endnotes.py
View File

@@ -76,7 +76,7 @@ def cite_source(bibliography, obj):
first = 0
(cindex, key) = bibliography.add_reference(ref)
txt += "%d" % (cindex + 1)
if key != None:
if key is not None:
txt += key
return txt

2
src/ReportBase/_GraphvizReportDialog.py
View File

@@ -931,7 +931,7 @@ class GraphvizReportDialog(ReportDialog):
self.row += 1
ext = self.format_menu.get_ext()
if ext == None:
if ext is None:
ext = ""
else:
spath = self.get_default_directory()

16
src/ReportBase/_ReportUtils.py
View File

@@ -1436,7 +1436,7 @@ def estimate_age(db, person, end_handle=None, start_handle=None, today=_TODAY):
if dhandle:
ddata = db.get_event_from_handle(dhandle).get_date_object()
else:
if today != None:
if today is not None:
ddata = today
else:
return (-1, -1)
@@ -1461,7 +1461,7 @@ def estimate_age(db, person, end_handle=None, start_handle=None, today=_TODAY):
else:
return high[2] - low[2]
if bstop == Date.EMPTY and dstop == Date.EMPTY:
if bstop == dstop == Date.EMPTY:
lower = _calc_diff(bstart, dstart)
age = (lower, lower)
elif bstop == Date.EMPTY:
@@ -1504,7 +1504,7 @@ def estimate_age_on_date(db, person, ddata=_TODAY):
return high[2] - low[2] - 1
else:
return high[2] - low[2]
if bstop == Date.EMPTY and dstop == Date.EMPTY:
if bstop == dstop == Date.EMPTY:
lower = _calc_diff(bstart, dstart)
age = [lower, lower]
elif bstop == Date.EMPTY:
@@ -1655,7 +1655,7 @@ def born_died_str(database, person, endnotes=None, name_object=None, person_name
if not name_object:
name_object = person.get_primary_name()
if person_name == None:
if person_name is None:
person_name = _nd.display_name(name_object)
elif person_name == 0:
if person.get_gender() == Person.MALE:
@@ -2140,7 +2140,7 @@ def born_str(database, person, person_name=None, verbose=True,
"""
name_index = 1
if person_name == None:
if person_name is None:
person_name = _nd.display(person)
elif person_name == 0:
name_index = 0
@@ -2238,7 +2238,7 @@ def died_str(database, person, person_name=None, verbose=True,
"""
name_index = 1
if person_name == None:
if person_name is None:
person_name = _nd.display(person)
elif person_name == 0:
name_index = 0
@@ -2321,7 +2321,7 @@ def buried_str(database, person, person_name=None, empty_date="", empty_place=""
"""
name_index = 0
if person_name == None:
if person_name is None:
person_name = _nd.display(person)
elif person_name == 0:
name_index = 1
@@ -2606,7 +2606,7 @@ def get_person_mark(db, person):
deathEvt = db.get_event_from_handle(death_ref.ref)
death = DateHandler.get_date(deathEvt)
if birth == " " and death == " ":
if birth == death == " ":
key = name
else:
key = "%s (%s - %s)" % (name, birth, death)