Code optimizations wrt handling of None - bug 2212

svn: r10811

src/DisplayModels/_BaseModel.py

@@ -271,7 +271,7 @@ class BaseModel(gtk.GenericTreeModel):
             self.node_map.set_path_map([ x[1] for x in self.sort_data ])
 
             index = self.node_map.get_path(handle)
-            if index != None:
+            if index is not None:
                 node = self.get_iter(index)
                 self.row_inserted(index, node)
 
@@ -332,23 +332,23 @@ class BaseModel(gtk.GenericTreeModel):
 
     def on_iter_children(self, node):
         """Return the first child of the node"""
-        if node == None and len(self.node_map):
+        if node is None and len(self.node_map):
             return self.node_map.get_first_handle()
         return None
 
     def on_iter_has_child(self, node):
         """returns true if this node has children"""
-        if node == None:
+        if node is None:
             return len(self.node_map) > 0
         return False
 
     def on_iter_n_children(self, node):
-        if node == None:
+        if node is None:
             return len(self.node_map)
         return 0
 
     def on_iter_nth_child(self, node, n):
-        if node == None:
+        if node is None:
             return self.node_map.get_handle(n)
         return None
 

src/DisplayModels/_PeopleModel.py

@@ -159,20 +159,20 @@ class NodeTreeMap:
             return self.path2iter.get((surname, val+1))
 
     def first_child(self, node):
-        if node == None:
+        if node is None:
             return self.top_path2iter[0]
         else:
             return self.path2iter.get((node, 0))
 
     def has_child(self, node):
-        if node == None:
+        if node is None:
             return len(self.sname_sub)
         if self.sname_sub.has_key(node) and len(self.sname_sub[node]) > 0:
             return True
         return False
 
     def number_of_children(self, node):
-        if node == None:
+        if node is None:
             return len(self.sname_sub)
         try:
             return len(self.sname_sub[node])
@@ -181,7 +181,7 @@ class NodeTreeMap:
 
     def get_nth_child(self, node, n):
         try:
-            if node == None:
+            if node is None:
                 return self.top_path2iter[n]
             try:
                 return self.path2iter[(node, n)]