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

28
src/DataViews/GrampletView.py
View File

@@ -136,7 +136,7 @@ def make_requested_gramplet(viewpage, name, opts, dbstate, uistate):
msg = None
if gui.pui:
msg = gui.pui.tooltip
if msg == None:
if msg is None:
msg = _("Drag Properties Button to move and click it for setup")
if msg:
gui.tooltips = gtk.Tooltips()
@@ -415,7 +415,7 @@ class Gramplet(object):
if iter.has_tag(tag):
if link_type == 'Person':
person = self.dbstate.db.get_person_from_handle(handle)
if person != None:
if person is not None:
if event.button == 1: # left mouse
if event.type == gtk.gdk._2BUTTON_PRESS: # double
try:
@@ -726,7 +726,7 @@ class MyScrolledWindow(gtk.ScrolledWindow):
# Hack to get around show_all that shows hidden items
# do once, the first time showing
if self.viewpage:
gramplets = [g for g in self.viewpage.gramplet_map.values() if g != None]
gramplets = [g for g in self.viewpage.gramplet_map.values() if g is not None]
self.viewpage = None
for gramplet in gramplets:
gramplet.gvoptions.hide()
@@ -820,7 +820,7 @@ class GrampletView(PageView.PersonNavView):
"""
Detach all of the mainframe gramplets from the columns.
"""
gramplets = [g for g in self.gramplet_map.values() if g != None]
gramplets = [g for g in self.gramplet_map.values() if g is not None]
for gramplet in gramplets:
if (gramplet.state == "windowed" or gramplet.state == "closed"):
continue
@@ -832,7 +832,7 @@ class GrampletView(PageView.PersonNavView):
"""
Place the gramplet mainframes in the columns.
"""
gramplets = [g for g in self.gramplet_map.values() if g != None]
gramplets = [g for g in self.gramplet_map.values() if g is not None]
# put the gramplets where they go:
# sort by row
gramplets.sort(lambda a, b: cmp(a.row, b.row))
@@ -913,7 +913,7 @@ class GrampletView(PageView.PersonNavView):
for gframe in self.columns[col]:
gramplet = self.frame_map[str(gframe)]
opts = get_gramplet_options_by_name(gramplet.name)
if opts != None:
if opts is not None:
base_opts = opts.copy()
for key in base_opts:
if key in gramplet.__dict__:
@@ -940,7 +940,7 @@ class GrampletView(PageView.PersonNavView):
row += 1
for gramplet in self.detached_gramplets:
opts = get_gramplet_options_by_name(gramplet.name)
if opts != None:
if opts is not None:
base_opts = opts.copy()
for key in base_opts:
if key in gramplet.__dict__:
@@ -1093,7 +1093,7 @@ class GrampletView(PageView.PersonNavView):
if gramplet.title == name:
#gramplet.state = "maximized"
self.closed_gramplets.remove(gramplet)
if self._popup_xy != None:
if self._popup_xy is not None:
self.drop_widget(self.widget, gramplet,
self._popup_xy[0], self._popup_xy[1], 0)
else:
@@ -1122,7 +1122,7 @@ class GrampletView(PageView.PersonNavView):
# set height on gramplet.scrolledwindow here:
gramplet.scrolledwindow.set_size_request(-1, gramplet.height)
## now drop it in right place
if self._popup_xy != None:
if self._popup_xy is not None:
self.drop_widget(self.widget, gramplet,
self._popup_xy[0], self._popup_xy[1], 0)
else:
@@ -1132,7 +1132,7 @@ class GrampletView(PageView.PersonNavView):
tname = obj.get_child().get_label()
all_opts = get_gramplet_options_by_tname(tname)
name = all_opts["name"]
if all_opts == None:
if all_opts is None:
print "Unknown gramplet type: '%s'; bad gramplets.ini file?" % name
return
if "title" not in all_opts:
@@ -1159,7 +1159,7 @@ class GrampletView(PageView.PersonNavView):
# set height on gramplet.scrolledwindow here:
gramplet.scrolledwindow.set_size_request(-1, gramplet.height)
## now drop it in right place
if self._popup_xy != None:
if self._popup_xy is not None:
self.drop_widget(self.widget, gramplet,
self._popup_xy[0], self._popup_xy[1], 0)
else:
@@ -1223,7 +1223,7 @@ class GrampletView(PageView.PersonNavView):
ag_menu = self.uistate.uimanager.get_widget('/Popup/AddGramplet')
if ag_menu:
qr_menu = ag_menu.get_submenu()
if qr_menu == None:
if qr_menu is None:
qr_menu = gtk.Menu()
names = [AVAILABLE_GRAMPLETS[key]["tname"] for key
in AVAILABLE_GRAMPLETS.keys()]
@@ -1235,7 +1235,7 @@ class GrampletView(PageView.PersonNavView):
rg_menu = self.uistate.uimanager.get_widget('/Popup/RestoreGramplet')
if rg_menu:
qr_menu = rg_menu.get_submenu()
if qr_menu != None:
if qr_menu is not None:
rg_menu.remove_submenu()
names = []
for gramplet in self.closed_gramplets:
@@ -1255,7 +1255,7 @@ class GrampletView(PageView.PersonNavView):
return False
def on_delete(self):
gramplets = [g for g in self.gramplet_map.values() if g != None]
gramplets = [g for g in self.gramplet_map.values() if g is not None]
for gramplet in gramplets:
# this is the only place where the gui runs user code directly
if gramplet.pui:

8
src/DataViews/PedigreeView.py
View File

@@ -1255,7 +1255,7 @@ class PedigreeView(PageView.PersonNavView):
def find_tree(self,person,index,depth,lst,val=0):
"""Recursively build a list of ancestors"""
if depth > 5 or person == None:
if depth > 5 or person is None:
return
try:
@@ -1276,7 +1276,7 @@ class PedigreeView(PageView.PersonNavView):
mrel = True
frel = True
family = self.dbstate.db.get_family_from_handle(family_handle)
if family != None:
if family is not None:
for child_ref in family.get_child_ref_list():
if child_ref.ref == person.handle:
mrel = child_ref.mrel == gen.lib.ChildRefType.BIRTH
@@ -1284,11 +1284,11 @@ class PedigreeView(PageView.PersonNavView):
lst[index] = (person,val,family,alive)
father_handle = family.get_father_handle()
if father_handle != None:
if father_handle is not None:
father = self.dbstate.db.get_person_from_handle(father_handle)
self.find_tree(father,(2*index)+1,depth+1,lst,frel)
mother_handle = family.get_mother_handle()
if mother_handle != None:
if mother_handle is not None:
mother = self.dbstate.db.get_person_from_handle(mother_handle)
self.find_tree(mother,(2*index)+2,depth+1,lst,mrel)

4
src/DataViews/PersonView.py
View File

@@ -527,7 +527,7 @@ class PersonView(PageView.PersonNavView):
active = self.dbstate.active
self.tree.set_model(self.model)
if const.USE_TIPS and self.model.tooltip_column != None:
if const.USE_TIPS and self.model.tooltip_column is not None:
self.tooltips = TreeTips.TreeTips(self.tree,
self.model.tooltip_column,
True)
@@ -984,7 +984,7 @@ class PersonView(PageView.PersonNavView):
node = self.model.on_get_iter(path)
# Node might be null if the surname is not known so test against None
while node != None:
while node is not None:
real_iter = self.model.get_iter(path)
for subindex in range(0, self.model.iter_n_children(real_iter)):
subpath = ((path[0], subindex))

4
src/DataViews/RelationView.py
View File

@@ -662,7 +662,7 @@ class RelationshipView(PageView.PersonNavView):
hbox = gtk.HBox()
label = widgets.MarkupLabel(msg, x_align=1)
# Draw the collapse/expand button:
if family != None:
if family is not None:
if self.check_collapsed(person.handle, family.handle):
arrow = widgets.ExpandCollapseArrow(True,
self.expand_collapse_press,
@@ -1189,7 +1189,7 @@ class RelationshipView(PageView.PersonNavView):
def write_family(self, family_handle, person = None):
family = self.dbstate.db.get_family_from_handle(family_handle)
if family == None:
if family is None:
from QuestionDialog import WarningDialog
WarningDialog(
_('Broken family detected'),