- Remove more Python 2 support code

CHANGES.rst

@@ -9,6 +9,9 @@ https://github.com/zopefoundation/Zope/blob/4.x/CHANGES.rst
 5.0a1 (unreleased)
 ------------------
 
+- Remove more Python 2 support code
+  (`#692 <https://github.com/zopefoundation/Zope/issues/692>`_)
+
 - Move retried request delay handling out of ``supports_retry``
   (`#474 <https://github.com/zopefoundation/Zope/issues/474>`_)
 

src/OFS/History.py

@@ -13,11 +13,8 @@
 """Object Histories
 """
 
-try:
-    from html import escape
-except ImportError:
-    from cgi import escape
 import difflib
+from html import escape
 from struct import pack
 from struct import unpack
 

src/OFS/ObjectManager.py

@@ -740,10 +740,6 @@ def __iter__(self):
     def __len__(self):
         return len(self.objectIds())
 
-    def __nonzero__(self):
-        # Py2
-        return self.__bool__()
-
     def __bool__(self):
         return True
 

src/OFS/absoluteurl.py

@@ -13,7 +13,6 @@
 ##############################################################################
 
 from six.moves.urllib.parse import quote
-from six.moves.urllib.parse import unquote
 
 from Acquisition import aq_parent
 from OFS.interfaces import ITraversable
@@ -35,9 +34,6 @@ class AbsoluteURL(BrowserView):
     all the methods that it uses yet.
     """
 
-    def __unicode__(self):
-        return unquote(self.__str__()).decode('utf-8')
-
     def __str__(self):
         context = self.context
         request = self.request
@@ -93,9 +89,6 @@ class OFSTraversableAbsoluteURL(BrowserView):
     """An absolute_url adapter for OFS.Traversable subclasses
     """
 
-    def __unicode__(self):
-        return unquote(self.__str__()).decode('utf-8')
-
     def __str__(self):
         return self.context.absolute_url()
 

src/Products/Five/tests/test_directives.py

@@ -14,8 +14,6 @@
 """Test the basic ZCML directives
 """
 
-from __future__ import absolute_import
-
 
 def test_directives():
     """

src/Products/Five/tests/test_size.py

@@ -13,8 +13,6 @@
 ##############################################################################
 """Size adapters for testing
 """
-from __future__ import absolute_import
-
 from zope.interface import implementer
 from zope.size.interfaces import ISized
 

src/ZPublisher/tests/test_xmlrpc.py

@@ -1,14 +1,9 @@
 import unittest
+import xmlrpc.client
 
 from DateTime import DateTime
 
 
-try:
-    import xmlrpc.client as xmlrpclib
-except ImportError:
-    import xmlrpclib
-
-
 class FauxResponse(object):
 
     def __init__(self):
@@ -49,7 +44,7 @@ def test_setBody(self):
         body_str = faux._body
         self.assertEqual(type(body_str), type(''))
 
-        as_set, method = xmlrpclib.loads(body_str)
+        as_set, method = xmlrpc.client.loads(body_str)
         as_set = as_set[0]
 
         self.assertIsNone(method)
@@ -62,7 +57,7 @@ def test_nil(self):
         faux = FauxResponse()
         response = self._makeOne(faux)
         response.setBody(body)
-        data, method = xmlrpclib.loads(faux._body)
+        data, method = xmlrpc.client.loads(faux._body)
         self.assertIs(data[0]['public'], None)
 
     def test_instance(self):
@@ -72,7 +67,7 @@ def test_instance(self):
         faux = FauxResponse()
         response = self._makeOne(faux)
         response.setBody(body)
-        data, method = xmlrpclib.loads(faux._body)
+        data, method = xmlrpc.client.loads(faux._body)
         data = data[0]
         self.assertEqual(data, {'public': 'def'})
 
@@ -84,7 +79,7 @@ def test_instanceattribute(self):
         faux = FauxResponse()
         response = self._makeOne(faux)
         response.setBody(body)
-        data, method = xmlrpclib.loads(faux._body)
+        data, method = xmlrpc.client.loads(faux._body)
         data = data[0]['public']
         self.assertEqual(data, {'public': 'def'})
 
@@ -95,7 +90,7 @@ def test_instanceattribute_recursive(self):
         faux = FauxResponse()
         response = self._makeOne(faux)
         response.setBody(body)
-        data, method = xmlrpclib.loads(faux._body)
+        data, method = xmlrpc.client.loads(faux._body)
         data = data[0]['public']['public']
         self.assertEqual(data, {'public': 'def'})
 
@@ -107,7 +102,7 @@ def test_instance_in_list(self):
         faux = FauxResponse()
         response = self._makeOne(faux)
         response.setBody(body)
-        data, method = xmlrpclib.loads(faux._body)
+        data, method = xmlrpc.client.loads(faux._body)
         data = data[0][0]
         self.assertEqual(data, {'public': 'def'})
 
@@ -119,7 +114,7 @@ def test_instance_in_dict(self):
         faux = FauxResponse()
         response = self._makeOne(faux)
         response.setBody(body)
-        data, method = xmlrpclib.loads(faux._body)
+        data, method = xmlrpc.client.loads(faux._body)
         data = data[0]['faux']
         self.assertEqual(data, {'public': 'def'})
 
@@ -129,9 +124,9 @@ def test_zopedatetimeinstance(self):
         faux = FauxResponse()
         response = self._makeOne(faux)
         response.setBody(body)
-        data, method = xmlrpclib.loads(faux._body)
+        data, method = xmlrpc.client.loads(faux._body)
         data = data[0]
-        self.assertTrue(isinstance(data, xmlrpclib.DateTime))
+        self.assertTrue(isinstance(data, xmlrpc.client.DateTime))
         self.assertEqual(data.value, u'2006-05-24T07:00:00+00:00')
 
     def test_zopedatetimeattribute(self):
@@ -140,9 +135,9 @@ def test_zopedatetimeattribute(self):
         faux = FauxResponse()
         response = self._makeOne(faux)
         response.setBody(body)
-        data, method = xmlrpclib.loads(faux._body)
+        data, method = xmlrpc.client.loads(faux._body)
         data = data[0]['public']
-        self.assertTrue(isinstance(data, xmlrpclib.DateTime))
+        self.assertTrue(isinstance(data, xmlrpc.client.DateTime))
         self.assertEqual(data.value, u'2006-05-24T07:00:00+00:00')
 
     def test_zopedatetimeattribute_recursive(self):
@@ -152,9 +147,9 @@ def test_zopedatetimeattribute_recursive(self):
         faux = FauxResponse()
         response = self._makeOne(faux)
         response.setBody(body)
-        data, method = xmlrpclib.loads(faux._body)
+        data, method = xmlrpc.client.loads(faux._body)
         data = data[0]['public']['public']
-        self.assertTrue(isinstance(data, xmlrpclib.DateTime))
+        self.assertTrue(isinstance(data, xmlrpc.client.DateTime))
         self.assertEqual(data.value, u'2006-05-24T07:00:00+00:00')
 
     def test_zopedatetimeinstance_in_list(self):
@@ -163,9 +158,9 @@ def test_zopedatetimeinstance_in_list(self):
         faux = FauxResponse()
         response = self._makeOne(faux)
         response.setBody(body)
-        data, method = xmlrpclib.loads(faux._body)
+        data, method = xmlrpc.client.loads(faux._body)
         data = data[0][0]
-        self.assertTrue(isinstance(data, xmlrpclib.DateTime))
+        self.assertTrue(isinstance(data, xmlrpc.client.DateTime))
         self.assertEqual(data.value, u'2006-05-24T07:00:00+00:00')
 
     def test_zopedatetimeinstance_in_dict(self):
@@ -174,9 +169,9 @@ def test_zopedatetimeinstance_in_dict(self):
         faux = FauxResponse()
         response = self._makeOne(faux)
         response.setBody(body)
-        data, method = xmlrpclib.loads(faux._body)
+        data, method = xmlrpc.client.loads(faux._body)
         data = data[0]['date']
-        self.assertTrue(isinstance(data, xmlrpclib.DateTime))
+        self.assertTrue(isinstance(data, xmlrpc.client.DateTime))
         self.assertEqual(data.value, u'2006-05-24T07:00:00+00:00')
 
     def test_functionattribute(self):
@@ -189,7 +184,7 @@ def foo():
         faux = FauxResponse()
         response = self._makeOne(faux)
         response.setBody(body)
-        func = xmlrpclib.loads(faux._body)
+        func = xmlrpc.client.loads(faux._body)
         self.assertEqual(func, (({'public': {}},), None))
 
     def test_emptystringattribute(self):
@@ -200,6 +195,6 @@ def test_emptystringattribute(self):
         faux = FauxResponse()
         response = self._makeOne(faux)
         response.setBody(body)
-        data, method = xmlrpclib.loads(faux._body)
+        data, method = xmlrpc.client.loads(faux._body)
         data = data[0]
         self.assertEqual(data, {'': True})

src/ZPublisher/xmlrpc.py

@@ -21,6 +21,7 @@
 
 import re
 import sys
+import xmlrpc.client
 
 from App.config import getConfiguration
 # Make DateTime.DateTime marshallable via XML-RPC
@@ -30,13 +31,7 @@
 from ZODB.POSException import ConflictError
 
 
-try:
-    import xmlrpc.client as xmlrpclib
-except ImportError:
-    import xmlrpclib
-
-
-WRAPPERS = xmlrpclib.WRAPPERS + (DateTime, )
+WRAPPERS = xmlrpc.client.WRAPPERS + (DateTime, )
 
 
 def dump_instance(self, value, write):
@@ -57,13 +52,8 @@ def dump_instance(self, value, write):
 
 # Override the standard marshaller for object instances
 # to skip private attributes.
-try:
-    from types import InstanceType
-    xmlrpclib.Marshaller.dispatch[InstanceType] = dump_instance  # py2
-except ImportError:
-    xmlrpclib.Marshaller.dispatch['_arbitrary_instance'] = dump_instance  # py3
-
-xmlrpclib.Marshaller.dispatch[DateTime] = dump_instance
+xmlrpc.client.Marshaller.dispatch['_arbitrary_instance'] = dump_instance
+xmlrpc.client.Marshaller.dispatch[DateTime] = dump_instance
 
 
 def parse_input(data):
@@ -87,7 +77,7 @@ def parse_input(data):
     # the function should return:
     #
     #     ('examples.getStateName', (41,))
-    params, method = xmlrpclib.loads(data)
+    params, method = xmlrpc.client.loads(data)
     # Translate '.' to '/' in meth to represent object traversal.
     method = method.replace('.', '/')
     return method, params
@@ -147,18 +137,18 @@ def __delattr__(self, name):
         return delattr(self._real, name)
 
     def setBody(self, body, title='', is_error=0, bogus_str_search=None):
-        if isinstance(body, xmlrpclib.Fault):
+        if isinstance(body, xmlrpc.client.Fault):
             # Convert Fault object to XML-RPC response.
-            body = xmlrpclib.dumps(body, methodresponse=1, allow_none=True)
+            body = xmlrpc.client.dumps(body, methodresponse=1, allow_none=True)
         else:
             # Marshall our body as an XML-RPC response. Strings will be sent
             # strings, integers as integers, etc. We do *not* convert
             # everything to a string first.
             # Previously this had special handling if the response
-            # was a Python None. This is now patched in xmlrpclib to
+            # was a Python None. This is now patched in xmlrpc.client to
             # allow Nones nested inside data structures too.
             try:
-                body = xmlrpclib.dumps(
+                body = xmlrpc.client.dumps(
                     (body,), methodresponse=1, allow_none=True)
             except ConflictError:
                 raise
@@ -186,7 +176,7 @@ def exception(self, fatal=0, info=None,
             return self._real.exception(fatal=fatal, info=info)
 
         # Create an appropriate Fault object. Containing error information
-        Fault = xmlrpclib.Fault
+        Fault = xmlrpc.client.Fault
         f = None
         try:
             # Strip HTML tags from the error value