Python 3 preparation: update calls to dict methods.

Tool-assisted patch.  Changes of iterkeys / itervalues / iteritems to
keys / values / items are fully automated, but may make things less
efficient in Python 2.  Automated tools want to add list() around many
calls to keys / values / items, but I thought most such list()
additions were unnecessary because it seemed the result of keys /
values / items was just iterated over while the set of dict keys
remained unchanged, rather than used in a way requiring an actual
list, or used while the set of keys in the dict could change.  It's
quite possible I missed some cases where list() was really needed, or
left in some unnecessary list() calls.

In cases where list() was only needed because the resulting list was
then sorted in-place, I changed the code to use calls to sorted().

Author: jsm28

detectors/newitemcopy.py

@@ -15,8 +15,7 @@ def generateCreateNote(db, cl, nodeid):
 
     # list the values
     m = []
-    prop_items = props.items()
-    prop_items.sort()
+    prop_items = sorted(props.items())
     for propname, prop in prop_items:
         value = cl.get(nodeid, propname, None)
         # skip boring entries

frontends/ZRoundup/ZRoundup.py

@@ -102,7 +102,7 @@ def getvalue(self, key, default=None):
     def has_key(self, item):
         return item in self.__form
     def keys(self):
-        return self.__form.keys()
+        return list(self.__form.keys())
 
     def __repr__(self):
         return '<ZRoundup.FormWrapper %r>'%self.__form

roundup/backends/back_anydbm.py

@@ -261,9 +261,7 @@ def addclass(self, cl):
 
     def getclasses(self):
         """Return a list of the names of all existing classes."""
-        l = self.classes.keys()
-        l.sort()
-        return l
+        return sorted(self.classes.keys())
 
     def getclass(self, classname):
         """Get the Class object representing a particular class.
@@ -484,7 +482,7 @@ def serialise(self, classname, node):
         """
         properties = self.getclass(classname).getprops()
         d = {}
-        for k, v in node.iteritems():
+        for k, v in node.items():
             if k == self.RETIRED_FLAG:
                 d[k] = v
                 continue
@@ -511,7 +509,7 @@ def unserialise(self, classname, node):
         """
         properties = self.getclass(classname).getprops()
         d = {}
-        for k, v in node.iteritems():
+        for k, v in node.items():
             # if the property doesn't exist, or is the "retired" flag then
             # it won't be in the properties dict
             if k not in properties:
@@ -600,7 +598,7 @@ def setjournal(self, classname, nodeid, journal):
     def fix_journal(self, classname, journal):
         """ fix password entries to correct type """
         pwprops = {}
-        for pn, prop in self.getclass(classname).properties.iteritems():
+        for pn, prop in self.getclass(classname).properties.items():
             if isinstance(prop, hyperdb.Password):
                 pwprops [pn] = 1
         if not pwprops:
@@ -724,7 +722,7 @@ def commit(self):
                 reindex[method(*args)] = 1
         finally:
             # make sure we close all the database files
-            for db in self.databases.itervalues():
+            for db in self.databases.values():
                 db.close()
             del self.databases
 
@@ -916,7 +914,7 @@ def create_inner(self, **propvalues):
 
         # validate propvalues
         num_re = re.compile('^\d+$')
-        for key, value in propvalues.iteritems():
+        for key, value in propvalues.items():
             if key == self.key:
                 try:
                     self.lookup(value)
@@ -1027,7 +1025,7 @@ def create_inner(self, **propvalues):
                     raise TypeError('new property "%s" not boolean'%key)
 
         # make sure there's data where there needs to be
-        for key, prop in self.properties.iteritems():
+        for key, prop in self.properties.items():
             if key in propvalues:
                 continue
             if key == self.key:
@@ -1168,7 +1166,7 @@ class or a KeyError is raised.
 
         self.fireAuditors('set', nodeid, propvalues)
         oldvalues = copy.deepcopy(self.db.getnode(self.classname, nodeid))
-        for name, prop in self.getprops(protected=0).iteritems():
+        for name, prop in self.getprops(protected=0).items():
             if name in oldvalues:
                 continue
             if isinstance(prop, hyperdb.Multilink):
@@ -1551,7 +1549,7 @@ def find(self, **propspec):
             db.issue.find(messages='1')
             db.issue.find(messages={'1':1,'3':1}, files={'7':1})
         """
-        for propname, itemids in propspec.iteritems():
+        for propname, itemids in propspec.items():
             # check the prop is OK
             prop = self.properties[propname]
             if not isinstance(prop, hyperdb.Link) and not isinstance(prop, hyperdb.Multilink):
@@ -1566,7 +1564,7 @@ def find(self, **propspec):
                 item = self.db.getnode(self.classname, id, db=cldb)
                 if self.db.RETIRED_FLAG in item:
                     continue
-                for propname, itemids in propspec.iteritems():
+                for propname, itemids in propspec.items():
                     if type(itemids) is not type({}):
                         itemids = {itemids:1}
 
@@ -1616,7 +1614,7 @@ def stringFind(self, **requirements):
                 node = self.db.getnode(self.classname, nodeid, cldb)
                 if self.db.RETIRED_FLAG in node:
                     continue
-                for key, value in requirements.iteritems():
+                for key, value in requirements.items():
                     if key not in node:
                         break
                     if node[key] is None or node[key].lower() != value:
@@ -1720,7 +1718,7 @@ def _filter(self, search_matches, filterspec, proptree,
         INTERVAL = 'spec:interval'
         OTHER = 'spec:other'
 
-        for k, v in filterspec.iteritems():
+        for k, v in filterspec.items():
             propclass = props[k]
             if isinstance(propclass, hyperdb.Link):
                 if type(v) is not type([]):
@@ -2001,7 +1999,7 @@ def addprop(self, **properties):
     def index(self, nodeid):
         """ Add (or refresh) the node to search indexes """
         # find all the String properties that have indexme
-        for prop, propclass in self.getprops().iteritems():
+        for prop, propclass in self.getprops().items():
             if isinstance(propclass, hyperdb.String) and propclass.indexme:
                 # index them under (classname, nodeid, property)
                 try:
@@ -2107,7 +2105,7 @@ def export_journals(self):
                 date = date.get_tuple()
                 if action == 'set':
                     export_data = {}
-                    for propname, value in params.iteritems():
+                    for propname, value in params.items():
                         if propname not in properties:
                             # property no longer in the schema
                             continue
@@ -2201,7 +2199,7 @@ def set(self, itemid, **propvalues):
 
         # create the oldvalues dict - fill in any missing values
         oldvalues = copy.deepcopy(self.db.getnode(self.classname, itemid))
-        for name, prop in self.getprops(protected=0).iteritems():
+        for name, prop in self.getprops(protected=0).items():
             if name in oldvalues:
                 continue
             if isinstance(prop, hyperdb.Multilink):
@@ -2238,7 +2236,7 @@ def index(self, nodeid):
         Use the content-type property for the content property.
         """
         # find all the String properties that have indexme
-        for prop, propclass in self.getprops().iteritems():
+        for prop, propclass in self.getprops().items():
             if prop == 'content' and propclass.indexme:
                 mime_type = self.get(nodeid, 'type', self.default_mime_type)
                 self.db.indexer.add_text((self.classname, nodeid, 'content'),

roundup/backends/indexer_common.py

@@ -40,7 +40,7 @@ def search(self, search_terms, klass, ignore={}):
             return {}
 
         designator_propname = {}
-        for nm, propclass in klass.getprops().iteritems():
+        for nm, propclass in klass.getprops().items():
             if _isLink(propclass):
                 designator_propname.setdefault(propclass.classname,
                     []).append(nm)
@@ -49,7 +49,7 @@ def search(self, search_terms, klass, ignore={}):
         # and files
         nodeids = {}      # this is the answer
         propspec = {}     # used to do the klass.find
-        for l in designator_propname.itervalues():
+        for l in designator_propname.values():
             for propname in l:
                 propspec[propname] = {}  # used as a set (value doesn't matter)
 

roundup/backends/indexer_dbm.py

@@ -204,7 +204,7 @@ def load_index(self, reload=0, wordlist=None):
                 dbslice = marshal.loads(pickle_str)
                 if dbslice.get('WORDS'):
                     # if it has some words, add them
-                    for word, entry in dbslice['WORDS'].iteritems():
+                    for word, entry in dbslice['WORDS'].items():
                         db['WORDS'][word] = entry
                 if dbslice.get('FILES'):
                     # if it has some files, add them
@@ -240,7 +240,7 @@ def save_index(self):
         segdicts = {}                           # Need batch of empty dicts
         for segment in letters:
             segdicts[segment] = {}
-        for word, entry in self.words.iteritems():  # Split into segment dicts
+        for word, entry in self.words.items():  # Split into segment dicts
             initchar = word[0].upper()
             segdicts[initchar][word] = entry
 
@@ -269,7 +269,7 @@ def purge_entry(self, identifier):
         del self.fileids[file_index]
 
         # The much harder part, cleanup the word index
-        for key, occurs in self.words.iteritems():
+        for key, occurs in self.words.items():
             if file_index in occurs:
                 del occurs[file_index]