Drop usage of code referencing PY2.

src/App/Management.py

@@ -13,6 +13,7 @@
 """Standard management interface support
 """
 
+import html
 import itertools
 
 import six
@@ -32,12 +33,6 @@
 from zope.interface import implementer
 
 
-try:
-    from html import escape
-except ImportError:  # PY2
-    from cgi import escape
-
-
 class Tabs(Base):
     """Mix-in provides management folder tab support."""
 
@@ -99,20 +94,20 @@ def tabs_path_default(self, REQUEST):
         steps = REQUEST._steps[:-1]
         script = REQUEST['BASEPATH1']
         linkpat = '{}/manage_workspace'
-        yield {'url': linkpat.format(escape(script, True)),
+        yield {'url': linkpat.format(html.escape(script, True)),
                'title': 'Root',
                'last': not bool(steps)}
         if not steps:
             return
         last = steps.pop()
         for step in steps:
             script = '%s/%s' % (script, step)
-            yield {'url': linkpat.format(escape(script, True)),
-                   'title': escape(unquote(step)),
+            yield {'url': linkpat.format(html.escape(script, True)),
+                   'title': html.escape(unquote(step)),
                    'last': False}
         script = '%s/%s' % (script, last)
-        yield {'url': linkpat.format(escape(script, True)),
-               'title': escape(unquote(last)),
+        yield {'url': linkpat.format(html.escape(script, True)),
+               'title': html.escape(unquote(last)),
                'last': True}
 
     def tabs_path_info(self, script, path):

src/OFS/CopySupport.py

@@ -671,10 +671,7 @@ def _cb_encode(d):
     json_bytes = dumps(d).encode('utf-8')
     squashed_bytes = compress(json_bytes, 2)  # -> bytes w/ useful encoding
     # quote for embeding in cookie
-    if six.PY2:
-        return quote(squashed_bytes)
-    else:
-        return quote(squashed_bytes.decode('latin-1'))
+    return quote(squashed_bytes.decode('latin-1'))
 
 
 def _cb_decode(s, maxsize=8192):
@@ -686,10 +683,7 @@ def _cb_decode(s, maxsize=8192):
     Return a list of text IDs.
     """
     dec = decompressobj()
-    if six.PY2:
-        squashed = unquote(s)
-    else:
-        squashed = unquote(s).encode('latin-1')
+    squashed = unquote(s).encode('latin-1')
     data = dec.decompress(squashed, maxsize)
     if dec.unconsumed_tail:
         raise ValueError

src/OFS/DTMLDocument.py

@@ -13,7 +13,6 @@
 """DTML Document objects.
 """
 
-import six
 from six.moves.urllib.parse import quote
 
 from AccessControl import getSecurityManager
@@ -103,9 +102,6 @@ def __call__(self, client=None, REQUEST={}, RESPONSE=None, **kw):
                 c = self.content_type
             else:
                 encoding = getattr(self, 'encoding', default_encoding)
-                if six.PY2 and not isinstance(r, six.text_type):
-                    # Prevent double-encoding edge cases under Python 2
-                    r = r.decode(encoding)
                 c, e = guess_content_type(self.getId(), r.encode(encoding))
             RESPONSE.setHeader('Content-Type', c)
         result = decapitate(r, RESPONSE)

src/OFS/DTMLMethod.py

@@ -14,10 +14,8 @@
 """
 import re
 
-from six import PY2
 from six import PY3
 from six import binary_type
-from six import text_type
 from six.moves.urllib.parse import quote
 
 from AccessControl import getSecurityManager
@@ -190,9 +188,6 @@ def __call__(self, client=None, REQUEST={}, RESPONSE=None, **kw):
                 c = self.content_type
             else:
                 encoding = getattr(self, 'encoding', default_encoding)
-                if PY2 and not isinstance(r, text_type):
-                    # Prevent double-encoding edge cases under Python 2
-                    r = r.decode(encoding)
                 c, e = guess_content_type(self.getId(), r.encode(encoding))
             RESPONSE.setHeader('Content-Type', c)
         result = decapitate(r, RESPONSE)
@@ -430,8 +425,6 @@ def safe_file_data(data):
         data = data.read()
     if PY3 and isinstance(data, binary_type):
         data = data.decode('utf-8')
-    if PY2 and isinstance(data, text_type):
-        data = data.encode('utf-8')
     return data
 
 

src/OFS/Image.py

@@ -13,11 +13,11 @@
 """Image object
 """
 
+import html
 import struct
 from email.generator import _make_boundary
 from io import BytesIO
 
-from six import PY2
 from six import binary_type
 from six import text_type
 
@@ -49,12 +49,6 @@
 from ZPublisher.HTTPRequest import FileUpload
 
 
-try:
-    from html import escape
-except ImportError:  # PY2
-    from cgi import escape
-
-
 manage_addFileForm = DTMLFile(
     'dtml/imageAdd',
     globals(),
@@ -669,10 +663,7 @@ def __bytes__(self):
         return bytes(self.data)
 
     def __str__(self):
-        if PY2:
-            return str(self.data)
-        else:
-            return self.data.decode(self._get_encoding())
+        return self.data.decode(self._get_encoding())
 
     def __bool__(self):
         return True
@@ -944,11 +935,11 @@ def tag(
 
         if alt is None:
             alt = getattr(self, 'alt', '')
-        result = '%s alt="%s"' % (result, escape(alt, True))
+        result = '%s alt="%s"' % (result, html.escape(alt, True))
 
         if title is None:
             title = getattr(self, 'title', '')
-        result = '%s title="%s"' % (result, escape(title, True))
+        result = '%s title="%s"' % (result, html.escape(title, True))
 
         if height:
             result = '%s height="%s"' % (result, height)
@@ -989,10 +980,6 @@ class Pdata(Persistent, Implicit):
     def __init__(self, data):
         self.data = data
 
-    if PY2:
-        def __getslice__(self, i, j):
-            return self.data[i:j]
-
     def __getitem__(self, key):
         return self.data[key]
 
@@ -1012,6 +999,3 @@ def __bytes__(self):
             _next = self.next
 
         return b''.join(r)
-
-    if PY2:
-        __str__ = __bytes__

src/OFS/ObjectManager.py

@@ -13,6 +13,7 @@
 """Object Manager
 """
 
+import html
 import os
 import re
 from io import BytesIO
@@ -63,12 +64,6 @@
 from zope.lifecycleevent import ObjectRemovedEvent
 
 
-try:
-    from html import escape
-except ImportError:  # PY2
-    from cgi import escape
-
-
 # Constants: __replaceable__ flags:
 NOT_REPLACEABLE = 0
 REPLACEABLE = 1
@@ -94,12 +89,12 @@ def checkValidId(self, id, allow_dup=0):
     # set to false before the object is added.
     if not id or not isinstance(id, str):
         if isinstance(id, text_type):
-            id = escape(id, True)
+            id = html.escape(id, True)
         raise BadRequest('Empty or invalid id specified', id)
     if bad_id(id) is not None:
         raise BadRequest(
             ('The id "%s" contains characters '
-             'illegal in URLs.' % escape(id, True)))
+             'illegal in URLs.' % html.escape(id, True)))
     if id in ('.', '..'):
         raise BadRequest(
             'The id "%s" is invalid because it is not traversable.' % id)
@@ -557,7 +552,8 @@ def manage_delObjects(self, ids=[], REQUEST=None):
                 pass
 
             if v is self:
-                raise BadRequest('%s does not exist' % escape(ids[-1], True))
+                raise BadRequest('%s does not exist' %
+                                 html.escape(ids[-1], True))
             self._delObject(id)
             del ids[-1]
         if REQUEST is not None:
@@ -642,14 +638,17 @@ def manage_importObject(self, file, REQUEST=None, set_owner=1,
         """Import an object from a file"""
         dirname, file = os.path.split(file)
         if dirname:
-            raise BadRequest('Invalid file name %s' % escape(file, True))
+            raise BadRequest('Invalid file name %s' % html.escape(file, True))
 
         for impath in self._getImportPaths():
             filepath = os.path.join(impath, 'import', file)
             if os.path.exists(filepath):
                 break
         else:
-            raise BadRequest('File does not exist: %s' % escape(file, True))
+            raise BadRequest(
+                'File does not exist: %s' %
+                html.escape(
+                    file, True))
 
         imported = self._importObjectFromFile(
             filepath, verify=bool(REQUEST), set_owner=set_owner,

src/OFS/PropertyManager.py

@@ -13,6 +13,8 @@
 """Property management
 """
 
+import html
+
 import six
 
 from AccessControl.class_init import InitializeClass
@@ -30,12 +32,6 @@
 from ZPublisher.Converters import type_converters
 
 
-try:
-    from html import escape
-except ImportError:  # PY2
-    from cgi import escape
-
-
 @implementer(IPropertyManager)
 class PropertyManager(Base):
     """
@@ -138,7 +134,7 @@ def valid_property_id(self, id):
            id[:3] == 'aq_' or \
            ' ' in id or \
            hasattr(aq_base(self), id) or \
-           escape(id, True) != id:
+           html.escape(id, True) != id:
             return 0
         return 1
 
@@ -215,7 +211,7 @@ def _updateProperty(self, id, value):
         self._wrapperCheck(value)
         if not self.hasProperty(id):
             raise BadRequest(
-                'The property %s does not exist' % escape(id, True))
+                'The property %s does not exist' % html.escape(id, True))
         if isinstance(value, (six.string_types, six.binary_type)):
             proptype = self.getPropertyType(id) or 'string'
             if proptype in type_converters:
@@ -225,7 +221,7 @@ def _updateProperty(self, id, value):
     def _delProperty(self, id):
         if not self.hasProperty(id):
             raise ValueError(
-                'The property %s does not exist' % escape(id, True))
+                'The property %s does not exist' % html.escape(id, True))
         self._delPropValue(id)
         self._properties = tuple(i for i in self._properties if i['id'] != id)
 
@@ -339,7 +335,7 @@ def manage_changeProperties(self, REQUEST=None, **kw):
             if self.hasProperty(name):
                 if 'w' not in propdict[name].get('mode', 'wd'):
                     raise BadRequest(
-                        '%s cannot be changed' % escape(name, True))
+                        '%s cannot be changed' % html.escape(name, True))
                 self._updateProperty(name, value)
 
         if REQUEST:
@@ -385,7 +381,7 @@ def manage_delProperties(self, ids=None, REQUEST=None):
             if not hasattr(aq_base(self), id):
                 raise BadRequest(
                     ('The property <em>%s</em> '
-                     'does not exist' % escape(id, True)))
+                     'does not exist' % html.escape(id, True)))
             if ('d' not in propdict[id].get('mode', 'wd')) or (id in nd):
                 raise BadRequest('Cannot delete %s' % id)
             self._delProperty(id)