Merge 5ee0a4d into b418067

CHANGES.rst

@@ -76,5 +76,8 @@ Backwards incompatible changes
   first, migrate to Python 3 and than switch to Zope 5.
   (`#692 <https://github.com/zopefoundation/Zope/issues/692>`_)
 
+- Remove Python 2 support code and dependency on ``six``.
+  (`#692 <https://github.com/zopefoundation/Zope/issues/692>`_)
+
 - Drop support for running Zope with ZServer as it is Python 2 only.
   (`#592 <https://github.com/zopefoundation/Zope/issues/592>`_)

setup.cfg

@@ -14,6 +14,7 @@ ignore =
 force_single_line = True
 combine_as_imports = True
 sections = FUTURE,STDLIB,THIRDPARTY,ZOPE,FIRSTPARTY,LOCALFOLDER
+known_standard_library = _thread
 known_third_party = ipaddress, PasteDeploy, six, waitress, chameleon, paste
 known_zope = AccessControl, Acquisition, DateTime, DocumentTemplate, ExtensionClass, MultiMapping, Persistence, persistent, RestrictedPython, Testing, transaction, ZConfig, zExceptions, ZODB, zope, Zope2, App
 default_section = ZOPE

setup.py

@@ -82,7 +82,6 @@ def _read_file(filename):
         'ZConfig >= 2.9.2',
         'ZODB',
         'setuptools >= 36.2',
-        'six',
         'transaction >= 2.4',
         'waitress',
         'zExceptions >= 3.4',

src/App/ApplicationManager.py

@@ -14,8 +14,7 @@
 import os
 import sys
 import time
-
-from six.moves.urllib import parse
+from urllib import parse
 
 from AccessControl.class_init import InitializeClass
 from AccessControl.requestmethod import requestmethod
@@ -30,7 +29,7 @@
 from Products.PageTemplates.PageTemplateFile import PageTemplateFile
 
 
-class FakeConnection(object):
+class FakeConnection:
     # Supports the methods of Connection that CacheManager needs
 
     def __init__(self, db, parent_jar):

src/App/Extensions.py

@@ -17,14 +17,12 @@
 import os
 from functools import total_ordering
 
-from six import exec_
-
 import Products
 from zExceptions import NotFound
 
 
 @total_ordering
-class FuncCode(object):
+class FuncCode:
 
     def __init__(self, f, im=0):
         self.co_varnames = f.__code__.co_varnames[im:]
@@ -183,7 +181,7 @@ def getObject(module, name, reload=0):
         raise NotFound("The specified module, '%s', "
                        "couldn't be opened." % module)
     module_dict = {}
-    exec_(execsrc, module_dict)
+    exec(execsrc, module_dict)
 
     if old is not None:
         # XXX Accretive??

src/App/Management.py

@@ -15,10 +15,8 @@
 
 import html
 import itertools
-
-import six
-from six.moves.urllib.parse import quote
-from six.moves.urllib.parse import unquote
+from urllib.parse import quote
+from urllib.parse import unquote
 
 import zope.event
 from AccessControl import ClassSecurityInfo
@@ -206,7 +204,7 @@ def manage_zmi_logout(self, REQUEST, RESPONSE):
     def _get_zmi_additionals(self, attrib):
         # Get additional assets for styling ZMI defined on properties in ZMI.
         additionals = getattr(self, attrib, ()) or ()
-        if isinstance(additionals, six.string_types):
+        if isinstance(additionals, str):
             additionals = (additionals, )
         return additionals
 

src/App/ProductContext.py

@@ -35,7 +35,7 @@
 LOG = getLogger('ProductContext')
 
 
-class ProductContext(object):
+class ProductContext:
 
     def __init__(self, product, app, package):
         self.__prod = product
@@ -205,15 +205,15 @@ def registerHelpTitle(self, title=None):
         pass
 
     def getProductHelp(self):
-        class DummyHelp(object):
+        class DummyHelp:
             lastRegistered = None
         return DummyHelp()
 
     def getApplication(self):
         return self.__app
 
 
-class AttrDict(object):
+class AttrDict:
 
     def __init__(self, ob):
         self.ob = ob

src/App/Undo.py

@@ -110,7 +110,7 @@ def manage_undo_transactions(self, transaction_info=(), REQUEST=None):
                 descriptions.append(tid[-1])
 
         if tids:
-            transaction.get().note(u"Undo %s" % ' '.join(descriptions))
+            transaction.get().note("Undo %s" % ' '.join(descriptions))
             self._p_jar.db().undoMultiple(tids)
 
         if REQUEST is not None:

src/App/ZApplication.py

@@ -18,7 +18,7 @@
 """
 
 
-class ZApplicationWrapper(object):
+class ZApplicationWrapper:
 
     def __init__(self, db, name, klass=None):
         self._db = db

src/App/config.py

@@ -51,7 +51,7 @@ def setConfiguration(cfg):
     os.environ["INSTANCE_HOME"] = cfg.instancehome
 
 
-class DefaultConfiguration(object):
+class DefaultConfiguration:
     """
     This configuration should be used effectively only during unit tests
     """

src/App/special_dtml.py

@@ -42,7 +42,7 @@
 )
 
 
-class Code(object):
+class Code:
     pass
 
 

src/App/tests/testManagement.py

@@ -47,7 +47,7 @@ class TestTabs(Testing.ZopeTestCase.ZopeTestCase):
 
     def setUp(self):
         from OFS.DTMLMethod import addDTMLMethod
-        super(TestTabs, self).setUp()
+        super().setUp()
         self.app.REQUEST['PARENTS'] = [self.app]
         addDTMLMethod(self.folder, 'page')
 

src/App/tests/test_ApplicationManager.py

@@ -8,7 +8,7 @@
 import Testing.ZopeTestCase
 
 
-class DummyConnection(object):
+class DummyConnection:
 
     def __init__(self, db):
         self.__db = db
@@ -17,7 +17,7 @@ def db(self):
         return self.__db
 
 
-class DummyDBTab(object):
+class DummyDBTab:
     def __init__(self, databases=None):
         self._databases = databases or {}
 
@@ -31,7 +31,7 @@ def getDatabase(self, name):
         return self._databases[name]
 
 
-class DummyDB(object):
+class DummyDB:
 
     _packed = None
 
@@ -53,22 +53,22 @@ def pack(self, when):
         self._packed = when
 
 
-class ConfigTestBase(object):
+class ConfigTestBase:
 
     def setUp(self):
-        super(ConfigTestBase, self).setUp()
+        super().setUp()
         import App.config
         self._old_config = App.config._config
 
     def tearDown(self):
         import App.config
         App.config._config = self._old_config
-        super(ConfigTestBase, self).tearDown()
+        super().tearDown()
 
     def _makeConfig(self, **kw):
         import App.config
 
-        class DummyConfig(object):
+        class DummyConfig:
             def __init__(self):
                 self.debug_mode = False
 
@@ -286,7 +286,7 @@ def _makeOne(self):
         return self._getTargetClass()()
 
     def _makeJar(self, dbname, dbsize):
-        class Jar(object):
+        class Jar:
             def db(self):
                 return self._db
         jar = Jar()
@@ -370,7 +370,7 @@ class MenuDtmlTests(ConfigTestBase, Testing.ZopeTestCase.FunctionalTestCase):
     """Browser testing ..dtml.menu.dtml."""
 
     def setUp(self):
-        super(MenuDtmlTests, self).setUp()
+        super().setUp()
         uf = self.app.acl_users
         uf.userFolderAddUser('manager', 'manager_pass', ['Manager'], [])
         self.browser = Testing.testbrowser.Browser()

src/App/tests/test_class_init.py

@@ -29,7 +29,7 @@ def test_extension_class(self):
         class AnotherClass(ExtensionClass.Base):
             _need__name__ = 1
 
-        class C(object):
+        class C:
             foo = AnotherClass
 
         InitializeClass(C)

src/OFS/Application.py

@@ -179,7 +179,7 @@ def initialize(app):
     initializer.initialize()
 
 
-class AppInitializer(object):
+class AppInitializer:
     """ Initialze an Application object (called at startup) """
 
     def __init__(self, app):
@@ -215,21 +215,21 @@ def install_app_manager(self):
             del app.__dict__['Control_Panel']
             app._objects = tuple(i for i in app._objects
                                  if i['id'] != 'Control_Panel')
-            self.commit(u'Removed persistent Control_Panel')
+            self.commit('Removed persistent Control_Panel')
 
     def install_required_roles(self):
         app = self.getApp()
 
         # Ensure that Owner role exists.
         if hasattr(app, '__ac_roles__') and not ('Owner' in app.__ac_roles__):
             app.__ac_roles__ = app.__ac_roles__ + ('Owner',)
-            self.commit(u'Added Owner role')
+            self.commit('Added Owner role')
 
         # ensure the Authenticated role exists.
         if hasattr(app, '__ac_roles__'):
             if 'Authenticated' not in app.__ac_roles__:
                 app.__ac_roles__ = app.__ac_roles__ + ('Authenticated',)
-                self.commit(u'Added Authenticated role')
+                self.commit('Added Authenticated role')
 
     def install_inituser(self):
         app = self.getApp()
@@ -238,7 +238,7 @@ def install_inituser(self):
             users = app.acl_users
             if hasattr(users, '_createInitialUser'):
                 app.acl_users._createInitialUser()
-                self.commit(u'Created initial user')
+                self.commit('Created initial user')
             users = aq_base(users)
             migrated = getattr(users, '_ofs_migrated', False)
             if not migrated:
@@ -252,7 +252,7 @@ def install_inituser(self):
                     users._ofs_migrated = True
                     users._p_changed = True
                     app._p_changed = True
-                    transaction.get().note(u'Migrated user folder')
+                    transaction.get().note('Migrated user folder')
                     transaction.commit()
 
     def install_virtual_hosting(self):
@@ -266,17 +266,17 @@ def install_virtual_hosting(self):
                 vhm = VirtualHostMonster()
                 vhm.id = 'virtual_hosting'
                 vhm.addToContainer(app)
-                self.commit(u'Added virtual_hosting')
+                self.commit('Added virtual_hosting')
 
     def install_root_view(self):
         app = self.getApp()
         if 'index_html' not in app:
             from Products.PageTemplates.ZopePageTemplate \
                 import ZopePageTemplate
             root_pt = ZopePageTemplate('index_html')
-            root_pt.pt_setTitle(u'Auto-generated default page')
+            root_pt.pt_setTitle('Auto-generated default page')
             app._setObject('index_html', root_pt)
-            self.commit(u'Added default view for root object')
+            self.commit('Added default view for root object')
 
     def install_products(self):
         return install_products(self.getApp())
@@ -287,7 +287,7 @@ def install_standards(self):
             delattr(app, '_standard_objects_have_been_added')
         if getattr(app, '_initializer_registry', None) is not None:
             delattr(app, '_initializer_registry')
-        transaction.get().note(u'Removed unused application attributes.')
+        transaction.get().note('Removed unused application attributes.')
         transaction.commit()
 
 

src/OFS/Cache.py

@@ -80,7 +80,7 @@ def getVerifiedManagerIds(container):
 manager_timestamp = 0
 
 
-class Cacheable(object):
+class Cacheable:
     """Mix-in for cacheable objects."""
 
     manage_options = (
@@ -386,7 +386,7 @@ def findCacheables(
         traceback.print_exc()
 
 
-class Cache(object):
+class Cache:
     """
     A base class (and interface description) for caches.
     Note that Cache objects are not intended to be visible by
@@ -420,7 +420,7 @@ def ZCache_set(self, ob, data, view_name, keywords, mtime_func):
         raise NotImplementedError
 
 
-class CacheManager(object):
+class CacheManager:
     """
     A base class for cache managers.  Implement ZCacheManager_getCache().
     """

src/OFS/CopySupport.py

@@ -19,13 +19,11 @@
 import warnings
 from json import dumps
 from json import loads
+from urllib.parse import quote
+from urllib.parse import unquote
 from zlib import compress
 from zlib import decompressobj
 
-import six
-from six.moves.urllib.parse import quote
-from six.moves.urllib.parse import unquote
-
 import transaction
 from AccessControl import ClassSecurityInfo
 from AccessControl import getSecurityManager
@@ -190,7 +188,7 @@ def _pasteObjects(self, cp, cb_maxsize=0):
         try:
             op, mdatas = _cb_decode(cp, cb_maxsize)
         except Exception as e:
-            six.raise_from(CopyError('Clipboard Error'), e)
+            raise CopyError('Clipboard Error') from e
 
         oblist = []
         app = self.getPhysicalRoot()

src/OFS/DTMLDocument.py

@@ -13,7 +13,7 @@
 """DTML Document objects.
 """
 
-from six.moves.urllib.parse import quote
+from urllib.parse import quote
 
 from AccessControl import getSecurityManager
 from AccessControl.class_init import InitializeClass