More Python3

src/App/FactoryDispatcher.py

@@ -146,7 +146,7 @@ def __getattr__(self, name):
 
         # Waaa
         m = 'Products.%s' % p.id
-        if m in sys.modules and sys.modules[m]._m.has_key(name):  # NOQA
+        if m in sys.modules and name in sys.modules[m]._m:  # NOQA
             return sys.modules[m]._m[name]
 
         raise AttributeError(name)

src/OFS/ObjectManager.py

@@ -810,7 +810,8 @@ def __len__(self):
         return len(self.objectIds())
 
     def __nonzero__(self):
-        return True
+        # Py2
+        return self.__bool__()
 
     def __bool__(self):
         return True

src/OFS/tests/testRanges.py

@@ -32,9 +32,10 @@ def createBigFile():
     size = (1 << 16) * 5 + 12345
     file = io.BytesIO()
 
-    def addLetter(x, add=file.write, l=string.letters, c=random.choice):
+    def addLetter(x, add=file.write, l=string.ascii_letters, c=random.choice):
         add(c(l))
-    filter(addLetter, list(range(size)))
+    for letter in range(size):
+        addLetter(letter)
 
     return file
 
@@ -67,7 +68,7 @@ def setUp(self):
             manage_addFolder(self.app, TESTFOLDER_NAME)
             folder = getattr(self.app, TESTFOLDER_NAME)
 
-            data = string.letters
+            data = string.ascii_letters
             manage_addFile(
                 folder, 'file', file=data, content_type='text/plain')
 

src/Products/PageTemplates/Expressions.py

@@ -356,7 +356,7 @@ def __next__(self):
     def next(self):
         if self._nextIndex > 0:
             self._last_item = self.item
-        return super(ZopeIterator, self).next()
+        return next(super(ZopeIterator, self))
 
 
 @implementer(ITraversable)

src/ZPublisher/HTTPRequest.py

@@ -1432,14 +1432,14 @@ def keys(self, returnTaints=0):
         while 1:
             n = n + 1
             key = "URL%s" % n
-            if not self.has_key(key):  # NOQA
+            if key not in self:  # NOQA
                 break
 
         n = 0
         while 1:
             n = n + 1
             key = "BASE%s" % n
-            if not self.has_key(key):  # NOQA
+            if key not in self:  # NOQA
                 break
 
         keys.update(self.other)
@@ -1691,10 +1691,8 @@ def __bool__(self):
         return not not self.filename
 
     def __nonzero__(self):
-        """FileUpload objects are considered false if their
-           filename is empty.
-        """
-        return not not self.filename
+        # Py2
+        return self.__bool__()
 
     def xreadlines(self):
         return self