Python3 compatible imports

.gitignore

@@ -6,10 +6,15 @@ lib
 include
 man
 parts
+*.egg-info/
 
 __pycache__
 .*
 *.dll
 *.pyc
 *.pyo
 *.so
+
+coverage.xml
+htmlcov/
+eggs/

.travis.yml

@@ -1,10 +1,29 @@
 language: python
+sudo: false
 python:
     - 2.7
+    - 3.4
+    - 3.5
+    - 3.6
+
 install:
-    - python bootstrap.py
-    - bin/buildout
+    - pip install six==1.10.0 # force here to avoid conflict with zc.recipe.testrunner
+    - pip install -U setuptools==33.1.1
+    - pip install coveralls coverage
+    - pip install zc.buildout
+    - buildout bootstrap
+    - buildout
+
 script:
-    - bin/test -v1
+    - coverage run bin/test -v1
+after_success:
+    - coverage combine
+    - coveralls
+
 notifications:
     email: false
+
+cache:
+  pip: true
+  directories:
+    - eggs/

CHANGES.rst

@@ -6,6 +6,12 @@ Changelog
 
 - Zope trunk compatibility for product init.
 
+- Fix _findModificationTime for ZODB 5
+  [davisagli]
+
+- Add Support for Python 3
+  [rudaporto, pbauer, icemac, davisagli]
+
 1.1.3 - 2010-10-02
 ------------------
 

bootstrap.py

@@ -0,0 +1,189 @@
+##############################################################################
+#
+# Copyright (c) 2006 Zope Foundation and Contributors.
+# All Rights Reserved.
+#
+# This software is subject to the provisions of the Zope Public License,
+# Version 2.1 (ZPL).  A copy of the ZPL should accompany this distribution.
+# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
+# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
+# FOR A PARTICULAR PURPOSE.
+#
+##############################################################################
+"""Bootstrap a buildout-based project
+
+Simply run this script in a directory containing a buildout.cfg.
+The script accepts buildout command-line options, so you can
+use the -c option to specify an alternate configuration file.
+"""
+
+import os
+import shutil
+import sys
+import tempfile
+
+from optparse import OptionParser
+
+tmpeggs = tempfile.mkdtemp()
+
+usage = '''\
+[DESIRED PYTHON FOR BUILDOUT] bootstrap.py [options]
+
+Bootstraps a buildout-based project.
+
+Simply run this script in a directory containing a buildout.cfg, using the
+Python that you want bin/buildout to use.
+
+Note that by using --find-links to point to local resources, you can keep
+this script from going over the network.
+'''
+
+parser = OptionParser(usage=usage)
+parser.add_option("-v", "--version", help="use a specific zc.buildout version")
+
+parser.add_option("-t", "--accept-buildout-test-releases",
+                  dest='accept_buildout_test_releases',
+                  action="store_true", default=False,
+                  help=("Normally, if you do not specify a --version, the "
+                        "bootstrap script and buildout gets the newest "
+                        "*final* versions of zc.buildout and its recipes and "
+                        "extensions for you.  If you use this flag, "
+                        "bootstrap and buildout will get the newest releases "
+                        "even if they are alphas or betas."))
+parser.add_option("-c", "--config-file",
+                  help=("Specify the path to the buildout configuration "
+                        "file to be used."))
+parser.add_option("-f", "--find-links",
+                  help=("Specify a URL to search for buildout releases"))
+parser.add_option("--allow-site-packages",
+                  action="store_true", default=False,
+                  help=("Let bootstrap.py use existing site packages"))
+parser.add_option("--setuptools-version",
+                  help="use a specific setuptools version")
+
+
+options, args = parser.parse_args()
+
+######################################################################
+# load/install setuptools
+
+try:
+    if options.allow_site_packages:
+        import setuptools
+        import pkg_resources
+    from urllib.request import urlopen
+except ImportError:
+    from urllib2 import urlopen
+
+ez = {}
+exec(urlopen('https://bootstrap.pypa.io/ez_setup.py').read(), ez)
+
+if not options.allow_site_packages:
+    # ez_setup imports site, which adds site packages
+    # this will remove them from the path to ensure that incompatible versions
+    # of setuptools are not in the path
+    import site
+    # inside a virtualenv, there is no 'getsitepackages'.
+    # We can't remove these reliably
+    if hasattr(site, 'getsitepackages'):
+        for sitepackage_path in site.getsitepackages():
+            sys.path[:] = [x for x in sys.path if sitepackage_path not in x]
+
+setup_args = dict(to_dir=tmpeggs, download_delay=0)
+
+if options.setuptools_version is not None:
+    setup_args['version'] = options.setuptools_version
+
+ez['use_setuptools'](**setup_args)
+import setuptools
+import pkg_resources
+
+# This does not (always?) update the default working set.  We will
+# do it.
+for path in sys.path:
+    if path not in pkg_resources.working_set.entries:
+        pkg_resources.working_set.add_entry(path)
+
+######################################################################
+# Install buildout
+
+ws = pkg_resources.working_set
+
+cmd = [sys.executable, '-c',
+       'from setuptools.command.easy_install import main; main()',
+       '-mZqNxd', tmpeggs]
+
+find_links = os.environ.get(
+    'bootstrap-testing-find-links',
+    options.find_links or
+    ('http://downloads.buildout.org/'
+     if options.accept_buildout_test_releases else None)
+    )
+if find_links:
+    cmd.extend(['-f', find_links])
+
+setuptools_path = ws.find(
+    pkg_resources.Requirement.parse('setuptools')).location
+
+requirement = 'zc.buildout'
+version = options.version
+if version is None and not options.accept_buildout_test_releases:
+    # Figure out the most recent final version of zc.buildout.
+    import setuptools.package_index
+    _final_parts = '*final-', '*final'
+
+    def _final_version(parsed_version):
+        try:
+            return not parsed_version.is_prerelease
+        except AttributeError:
+            # Older setuptools
+            for part in parsed_version:
+                if (part[:1] == '*') and (part not in _final_parts):
+                    return False
+            return True
+
+    index = setuptools.package_index.PackageIndex(
+        search_path=[setuptools_path])
+    if find_links:
+        index.add_find_links((find_links,))
+    req = pkg_resources.Requirement.parse(requirement)
+    if index.obtain(req) is not None:
+        best = []
+        bestv = None
+        for dist in index[req.project_name]:
+            distv = dist.parsed_version
+            if _final_version(distv):
+                if bestv is None or distv > bestv:
+                    best = [dist]
+                    bestv = distv
+                elif distv == bestv:
+                    best.append(dist)
+        if best:
+            best.sort()
+            version = best[-1].version
+if version:
+    requirement = '=='.join((requirement, version))
+cmd.append(requirement)
+
+import subprocess
+if subprocess.call(cmd, env=dict(os.environ, PYTHONPATH=setuptools_path)) != 0:
+    raise Exception(
+        "Failed to execute command:\n%s" % repr(cmd)[1:-1])
+
+######################################################################
+# Import and run buildout
+
+ws.add_entry(tmpeggs)
+ws.require(requirement)
+import zc.buildout.buildout
+
+if not [a for a in args if '=' not in a]:
+    args.append('bootstrap')
+
+# if -c was provided, we push it back into args for buildout' main function
+if options.config_file is not None:
+    args[0:0] = ['-c', options.config_file]
+
+zc.buildout.buildout.main(args)
+shutil.rmtree(tmpeggs)

buildout.cfg

@@ -0,0 +1,22 @@
+[buildout]
+extends =
+    https://raw.githubusercontent.com/zopefoundation/Zope/master/versions.cfg
+    https://raw.githubusercontent.com/zopefoundation/Zope/master/sources.cfg
+develop = .
+parts = interpreter test coverage
+
+[interpreter]
+recipe = zc.recipe.egg
+interpreter = python
+eggs =
+    AccessControl
+    tox
+
+[test]
+recipe = zc.recipe.testrunner
+eggs = Products.ZopeVersionControl
+
+[coverage]
+recipe = zc.recipe.testrunner
+eggs = Products.ZopeVersionControl
+defaults = ['--coverage', '../../coverage', '-v', '--auto-progress']

setup.py

@@ -12,6 +12,10 @@
         'Framework :: Zope2',
         'Programming Language :: Python',
         'Programming Language :: Python :: 2.7',
+        'Programming Language :: Python :: 3.4',
+        'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.6',
+        'Programming Language :: Python :: 3.7',
     ],
     license='ZPL',
     author='Zope Foundation and Contributors',
@@ -28,7 +32,8 @@
         'Acquisition',
         'DateTime',
         'transaction',
-        'ZODB3',
+        'six',
+        'ZODB',
         'Zope2',
     ],
 )

src/Products/ZopeVersionControl/EventLog.py

@@ -11,11 +11,12 @@
 #
 ##############################################################################
 
+from .Utility import _findUserId
 from App.class_init import default__class_init__ as InitializeClass
-from Persistence import Persistent
 from AccessControl import ClassSecurityInfo
 from BTrees.IOBTree import IOBTree
-from Utility import _findUserId
+from Persistence import Persistent
+
 import time
 
 MAX32 = int(2**31 - 1)