Python 3 preparation: change "x.has_key(y)" to "y in x".

(Also likewise "not in" where appropriate.)  Tool-generated patch.

Author: jsm28

detectors/creator_resolution.py

@@ -9,7 +9,7 @@ def creator_resolution(db, cl, nodeid, newvalues):
     "confirm-done" first though, but "classic" Roundup doesn't have that
     status)
     '''
-    if not newvalues.has_key('status'):
+    if 'status' not in newvalues:
         return
 
     # get the resolved state ID

detectors/emailauditor.py

@@ -29,7 +29,7 @@ def eml_to_mht(db, cl, nodeid, newvalues):
 
     So... we do that. :)'''
     if newvalues.get('type', '').lower() == "message/rfc822":
-        if not newvalues.has_key('name'):
+        if 'name' not in newvalues:
             newvalues['name'] = 'email.mht'
             return
         name = newvalues['name']

frontends/ZRoundup/ZRoundup.py

@@ -95,12 +95,12 @@ def __getitem__(self, item):
     def __iter__(self):
         return iter(self.__form)
     def getvalue(self, key, default=None):
-        if self.__form.has_key(key):
+        if key in self.__form:
             return self.__form[key]
         else:
             return default
     def has_key(self, item):
-        return self.__form.has_key(item)
+        return item in self.__form
     def keys(self):
         return self.__form.keys()
 

frontends/ZRoundup/__init__.py

@@ -19,7 +19,7 @@
 import os
 # figure where ZRoundup is installed
 here = None
-if os.environ.has_key('INSTANCE_HOME'):
+if 'INSTANCE_HOME' in os.environ:
     here = os.environ['INSTANCE_HOME']
     path = os.path.join(here, 'Products', 'ZRoundup')
     if not os.path.exists(path):

roundup/backends/back_mysql.py

@@ -49,10 +49,10 @@
 
 def connection_dict(config, dbnamestr=None):
     d = rdbms_common.connection_dict(config, dbnamestr)
-    if d.has_key('password'):
+    if 'password' in d:
         d['passwd'] = d['password']
         del d['password']
-    if d.has_key('port'):
+    if 'port' in d:
         d['port'] = int(d['port'])
     return d
 
@@ -252,12 +252,12 @@ def add_new_columns_v2(self):
             for name, s_prop in old_spec[1]:
                 # s_prop is a repr() string of a hyperdb type object
                 if s_prop.find('Multilink') == -1:
-                    if properties.has_key(name):
+                    if name in properties:
                         propnames.append(name)
                     continue
                 tn = '%s_%s'%(cn, name)
 
-                if properties.has_key(name):
+                if name in properties:
                     # grabe the current values
                     sql = 'select linkid, nodeid from %s'%tn
                     self.sql(sql)
@@ -268,7 +268,7 @@ def add_new_columns_v2(self):
                 sql = 'drop table %s'%tn
                 self.sql(sql)
 
-                if properties.has_key(name):
+                if name in properties:
                     # re-create and populate the new table
                     self.create_multilink_table(klass, name)
                     sql = '''insert into %s (linkid, nodeid) values

roundup/cgi/PageTemplates/MultiMapping.py

@@ -5,13 +5,13 @@ def __init__(self, *stores):
         self.stores = list(stores)
     def __getitem__(self, key):
         for store in self.stores:
-            if store.has_key(key):
+            if key in store:
                 return store[key]
         raise KeyError(key)
     _marker = []
     def get(self, key, default=_marker):
         for store in self.stores:
-            if store.has_key(key):
+            if key in store:
                 return store[key]
         if default is self._marker:
             raise KeyError(key)

roundup/cgi/PageTemplates/PageTemplate.py

@@ -93,7 +93,7 @@ def pt_render(self, source=0, extra_context={}):
         return output.getvalue()
 
     def __call__(self, *args, **kwargs):
-        if not kwargs.has_key('args'):
+        if 'args' not in kwargs:
             kwargs['args'] = args
         return self.pt_render(extra_context={'options': kwargs})
 

roundup/cgi/PageTemplates/TALES.py

@@ -114,7 +114,7 @@ def registerType(self, name, handler):
         if not _valid_name(name):
             raise RegistrationError('Invalid Expression type "%s".' % name)
         types = self.types
-        if types.has_key(name):
+        if name in types:
             raise RegistrationError(
                 'Multiple registrations for Expression type "%s".' %
                 name)

roundup/cgi/TAL/DummyEngine.py

@@ -27,7 +27,7 @@
 ustr = str
 
 IDomain = None
-if sys.modules.has_key('Zope'):
+if 'Zope' in sys.modules:
     try:
         from Zope.I18n.ITranslationService import ITranslationService
         from Zope.I18n.IDomain import IDomain
@@ -114,7 +114,7 @@ def evaluate(self, expression):
         if type == "not":
             return not self.evaluate(expr)
         if type == "exists":
-            return self.locals.has_key(expr) or self.globals.has_key(expr)
+            return expr in self.locals or expr in self.globals
         if type == "python":
             try:
                 return eval(expr, self.globals, self.locals)
@@ -132,9 +132,9 @@ def evaluate(self, expression):
 
     def evaluatePathOrVar(self, expr):
         expr = expr.strip()
-        if self.locals.has_key(expr):
+        if expr in self.locals:
             return self.locals[expr]
-        elif self.globals.has_key(expr):
+        elif expr in self.globals:
             return self.globals[expr]
         else:
             raise TALESError("unknown variable: %s" % repr(expr))

roundup/cgi/TAL/HTMLTALParser.py

@@ -183,7 +183,7 @@ def close_para_tags(self, tag):
         if tag in EMPTY_HTML_TAGS:
             return
         close_to = -1
-        if BLOCK_CLOSING_TAG_MAP.has_key(tag):
+        if tag in BLOCK_CLOSING_TAG_MAP:
             blocks_to_close = BLOCK_CLOSING_TAG_MAP[tag]
             for i in range(len(self.tagstack)):
                 t = self.tagstack[i]
@@ -295,17 +295,17 @@ def process_ns(self, name, attrs):
             if ns and ns != 'unknown':
                 item = (key, value, ns)
             if ns == 'tal':
-                if taldict.has_key(keybase):
+                if keybase in taldict:
                     raise TALError("duplicate TAL attribute " +
                                    repr(keybase), self.getpos())
                 taldict[keybase] = value
             elif ns == 'metal':
-                if metaldict.has_key(keybase):
+                if keybase in metaldict:
                     raise METALError("duplicate METAL attribute " +
                                      repr(keybase), self.getpos())
                 metaldict[keybase] = value
             elif ns == 'i18n':
-                if i18ndict.has_key(keybase):
+                if keybase in i18ndict:
                     raise I18NError("duplicate i18n attribute " +
                                     repr(keybase), self.getpos())
                 i18ndict[keybase] = value