Merge lp:~bellini666/storm/py3 into lp:storm

[Thiago Bellini]

Make storm work with python2 and python3 using futurize and six.

Make storm work with python2 and python3 using futurize and six.

This branch has been tested with stoq <https://github.com/stoq/stoq> test suite, which covers a good amount of storm code using postgresql.

[lp:~bellini666/storm/py3]

494. By Thiago Bellini on 2017-06-08

Workaround virtual subclass checking in python3

The exception handling ignores virtual subclasses in python3

495. By Thiago Bellini on 2017-06-09

Update setup.py using the one from the debian package

[Stuart Bishop (stub)]

A critical part of landing this on trunk is a test suite working under both python2.7 and python3. I haven't succeeded here (using a fresh Xenial container).

The mechanical python2->python3 bits seem fine.

I'm in no way qualified to review storm/cextensions.c , so will be relying on the tests here unless I can get some alternative eyeballs to have a look.

I'm unsure about the changes from explicit large ints to plain ints (1L -> 1). I haven't looked closely into what the tests that needed this change were actually testing, and how this change can be valid under both py2 and py3.

I've setup a clean Xenial container, and setup a dev environment to run the test suite (we can only land this if the tests pass under both python2 and python3).

dev/ubuntu-deps needs updating (or an alternative mechanism for getting developer dependencies. Add these packages: python-future python3-future python-dev python3-dev python3-mysqldb python3-fixtures python3-psycopg2 python3-testresources python3-transaction python3-twisted python3-zope.component python3-zope.security python3-setuptools

'make check' uses the default python2, and is running 0 tests. Something has broken with test discovery, and this needs to be fixed.

'make check PYTHON=python3' uses python3, and is failing to build:

$ make check PYTHON=python3
STORM_CEXTENSIONS=0 python3 setup.py test
running test
running egg_info
writing dependency_links to storm.egg-info/dependency_links.txt
writing top-level names to storm.egg-info/top_level.txt
writing storm.egg-info/PKG-INFO
reading manifest file 'storm.egg-info/SOURCES.txt'
reading manifest template 'MANIFEST.in'
warning: no files found matching 'ez_setup.py'
writing manifest file 'storm.egg-info/SOURCES.txt'
running build_ext
copying build/lib.linux-x86_64-3.5/storm/cextensions.cpython-35m-x86_64-linux-gnu.so -> storm
Traceback (most recent call last):
  File "setup.py", line 57, in <module>
    [Extension("storm.cextensions", ["storm/cextensions.c"])])
  File "/usr/lib/python3.5/distutils/core.py", line 148, in setup
    dist.run_commands()
  File "/usr/lib/python3.5/distutils/dist.py", line 955, in run_commands
    self.run_command(cmd)
  File "/usr/lib/python3.5/distutils/dist.py", line 974, in run_command
    cmd_obj.run()
  File "/usr/lib/python3/dist-packages/setuptools/command/test.py", line 159, in run
    self.with_project_on_sys_path(self.run_tests)
  File "/usr/lib/python3/dist-packages/setuptools/command/test.py", line 140, in with_project_on_sys_path
    func()
  File "/usr/lib/python3/dist-packages/setuptools/command/test.py", line 180, in run_tests
    testRunner=self._resolve_as_ep(self.test_runner),
  File "/usr/lib/python3.5/unittest/main.py", line 93, in __init__
    self.parseArgs(argv)
  File "/usr/lib/python3.5/unittest/main.py", line 123, in parseArgs
    self._do_discovery([])
  File "/usr/lib/python3.5/unittest/main.py", line 228, in _do_discovery
    self.test = loader.discover(self.start, self.pattern, self.top)
  File "/usr/lib/python3.5/unittest/loader.py", line 341, in discover
    tests = list(self._find_tests(start_dir, pattern))
  File "/usr/lib/python3.5/unittest/loader.py", line 398, in _find_tests
    full_pa...

review: Needs Fixing

[Ronaldo Maia (romaia)]

I will assume this patch and will send a new version addressing this issues (and some other issues I found with cextensions).

[Markus Kemmerling (markus-kemmerling)]

Any news on this? I would really like to see a Python 3 compatible release of storm.

The branch worked for me after two additional fixes. The first one is related to Zope security proxies. For some reason I do not really understand I had to define a '__len__' method for result and reference sets to be able to pass security proxied sets to the 'list' or 'tuple' constructor (although iterating over the sets worked).

The second fix affects the C extensions which raised a 'TypeError' for compile methods that pass the 'join' parameter, e.g. 'storm.expr.compile_compound_oper()'. I am not a C programmer and never wrote a Python C extension. But after reading a few lines of the C API docs I found that the error arises from an invalid 'S' format character in the 'PyArg_ParseTupleAndKeywords()' call inside 'Compile__call__()'. Replacing the 'S' with an 'U' made the C extensions work for me:

--- cextensions.c.ORIG 2018-07-06 08:46:29.000000000 +0200
+++ cextensions.c 2018-07-05 14:37:02.000000000 +0200
@@ -1682,7 +1682,7 @@

     join = default_compile_join;

- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O|OSbb", kwlist,
+ if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O|OUbb", kwlist,
                                      &expr, &state, &join, &raw, &token)) {
         return NULL;
     }

[Colin Watson (cjwatson)]

Thanks for doing this work.

Status report: I've been breaking this down into more reviewable pieces and sending small MPs for each (in some cases doing the work independently, and in some cases borrowing from this MP and giving credit where appropriate). I also switched to tox for running tests, which makes it much easier to run a suitable test matrix. There's still quite a bit to go, but I've got a fair amount merged already and I plan to continue.

[Thiago Bellini (bellini666)]

> Thanks for doing this work.
>
> Status report: I've been breaking this down into more reviewable pieces and
> sending small MPs for each (in some cases doing the work independently, and in
> some cases borrowing from this MP and giving credit where appropriate). I
> also switched to tox for running tests, which makes it much easier to run a
> suitable test matrix. There's still quite a bit to go, but I've got a fair
> amount merged already and I plan to continue.

I don't like the fact that the work I've done is being authored by someone else, and I'm loosing the right to say that I contributed to the project. Sends a very sad message to future contributors...

At least this project is finally seeing an update to python3.

[Colin Watson (cjwatson)]

Huh, wait, I'm not claiming credit for your work; where I've committed things with my authorship they have been actually different in substantive ways (e.g. for int/long handling I took more care to ensure that the tests were still meaningful on Python 2 while not being syntax errors on Python 3, and for print function conversion I added a bunch of __future__ imports to make it more robust. By contrast, the string exception fix I landed just now (admittedly a small change) I cherry-picked directly from your branch and the commit has your authorship on it. I expect there to be more of the latter. You will absolutely not lose the right to say that you contributed to the project, and I'm sorry for giving that impression.

If I could have fixed up this branch and landed it then I absolutely would have done, but it was just too much to digest, particularly given the poor testing situation described by Stuart. Since most of the comments made on this branch were over a year and a half ago, it seemed likely that you weren't going to have time to engage with them, and attempts by other people to do so also seemed to have stalled. There are also aspects of this branch that I'm not sure I agree with and may want to do differently. On the other hand there are certainly parts of your changes where you seem to know better than I and I expect to be trying to land your changes rather directly, such as the virtual subclass handling or the fleshing out of special object methods.

The approach I'm taking of breaking the branch down into small pieces, separating the large but essentially-mechanical changes from the ones that are non-trivial and require thought so that reviewers can skim-read the former and think hard about the latter, means that most of your work can actually land even if we choose to do some parts of it differently. I would very much encourage future contributors (including you, if you choose to contribute further) to take the approach of many small merge proposals rather than one large one.

[Thiago Bellini (bellini666)]

Regarding the main issue, ok, I understood your motivations.

I would just disagree with the many small merge proposals in this situation specifically. Here are my thoughts about that:

1) The code is actually broken in small pieces. Each change is in its own commit, there's not a single large commit doing the whole "python2 -> python3" migration.

2) Having said that, knowing that there's a dependency between each of those changes in a lot of the times, dividing them into small merge proposals would produce a lot of divergences, specially after code reviews.

3) Testing those would be a nightmare since to test with python3, I cannot just test the unicode migration without doing other one if that needs to be done in the same piece of code.

4) Because storm uses bzr instead of git, there would be no way to open a lot of merge proposals, each one for each subsequent commit, and as long as they were merged in sequence, it would be possible to mimic what you are trying to acomplish.

5) Lastly, the purpose of a merge proposal is to merge a "feature" which was developed in a branch containing a sequence of commits. There are features which can be broken into parts, but "migrate python2 to python3" IMO is something atomic.

But again, that is my opinion and maybe your and the other maintainers of the project will disagree with me. Either way I just wanted to point it out.

[Colin Watson (cjwatson)]

OK, I indeed do disagree with you on this and it seems worth explaining why. Point-by-point:

1) I understand that, indeed, but merge proposals are the unit of code review and 3000+-line merge proposals are typically viewed as rather indigestible. It is true that it's possible to go and look at the individual commits, but it's then difficult to comment on those individually. (Some of this is admittedly due to shortcomings in the Launchpad code review system, but you work with what you've got.) It also puts maintainers in a difficult position when they disagree with something near the start of your sequence of commits: what are they to do when they give you feedback and you don't respond for over 18 months, which is something that does happen from time to time (and indeed happened in this case)? They can't easily merge the rest of it and finish off the last bits in some other way, because you've linearised it all.

2) Lots of the changes aren't interdependent and can be proposed in parallel without causing this kind of problem. This is exactly what I've been doing. If you propose the non-interdependent changes in a form that can be tested separately, then you make reviewers' lives easier because they know they can merge the uncontroversial ones separately and reduce the overall size of what's left; that's much harder with a single linearised branch because later commits might well rely on earlier ones and not be cherry-pickable.

3) It's true that it's less easy to test the whole assembly until you're quite far along. On the other hand this merge proposal wasn't fully tested with Python 3 anyway since it fails tests in the way that Stuart pointed out in August 2017 (I proposed https://code.launchpad.net/~cjwatson/storm/zope-interface-class-decorators/+merge/368445 to fix the particular test failures they quoted), and so there may still be other problems that we haven't reached yet; I understand that you tested with stoq, which is useful, but our first concern is to ensure that our own test suite passes. And in practice for Python 3 porting one often starts by working through many well-understood standard changes, ensuring that each one continues to pass tests on Python 2, and then seeing what's left once the codebase is in a testable state. This strategy works well enough when filing many small merge proposals, since they're of a size where the feedback loop between proposer and reviewer can be reasonably short.

4) You can use prerequisite branches on merge proposals if you like. See my comment at the end of 1) for the practical problems caused by this, though.

5) This is a reasonable philosophical disagreement, but I do find my approach works better in practice. I've done quite a lot of other Python 3 porting work this way.

In any case, I'm certainly grateful for the work you've done on this and will explicitly credit you in the NEWS file regardless of the exact balance of specific commits that end up with your name on them, as well as others who've contributed here.

[Colin Watson (cjwatson)]

This is now effectively landed (with some commits from this branch, and some commits prepared separately) in Storm 0.21. Thanks!

=== removed file 'ez_setup.py'
--- ez_setup.py	2011-10-18 13:59:56 +0000
+++ ez_setup.py	1970-01-01 00:00:00 +0000
@@ -1,284 +0,0 @@
-#!python
-"""Bootstrap setuptools installation
-
-If you want to use setuptools in your package's setup.py, just include this
-file in the same directory with it, and add this to the top of your setup.py::
-
-    from ez_setup import use_setuptools
-    use_setuptools()
-
-If you want to require a specific version of setuptools, set a download
-mirror, or use an alternate download directory, you can do so by supplying
-the appropriate options to ``use_setuptools()``.
-
-This file can also be run as a script to install or upgrade setuptools.
-"""
-import sys
-DEFAULT_VERSION = "0.6c11"
-DEFAULT_URL     = "http://pypi.python.org/packages/%s/s/setuptools/" % sys.version[:3]
-
-md5_data = {
-    'setuptools-0.6b1-py2.3.egg': '8822caf901250d848b996b7f25c6e6ca',
-    'setuptools-0.6b1-py2.4.egg': 'b79a8a403e4502fbb85ee3f1941735cb',
-    'setuptools-0.6b2-py2.3.egg': '5657759d8a6d8fc44070a9d07272d99b',
-    'setuptools-0.6b2-py2.4.egg': '4996a8d169d2be661fa32a6e52e4f82a',
-    'setuptools-0.6b3-py2.3.egg': 'bb31c0fc7399a63579975cad9f5a0618',
-    'setuptools-0.6b3-py2.4.egg': '38a8c6b3d6ecd22247f179f7da669fac',
-    'setuptools-0.6b4-py2.3.egg': '62045a24ed4e1ebc77fe039aa4e6f7e5',
-    'setuptools-0.6b4-py2.4.egg': '4cb2a185d228dacffb2d17f103b3b1c4',
-    'setuptools-0.6c1-py2.3.egg': 'b3f2b5539d65cb7f74ad79127f1a908c',
-    'setuptools-0.6c1-py2.4.egg': 'b45adeda0667d2d2ffe14009364f2a4b',
-    'setuptools-0.6c10-py2.3.egg': 'ce1e2ab5d3a0256456d9fc13800a7090',
-    'setuptools-0.6c10-py2.4.egg': '57d6d9d6e9b80772c59a53a8433a5dd4',
-    'setuptools-0.6c10-py2.5.egg': 'de46ac8b1c97c895572e5e8596aeb8c7',
-    'setuptools-0.6c10-py2.6.egg': '58ea40aef06da02ce641495523a0b7f5',
-    'setuptools-0.6c11-py2.3.egg': '2baeac6e13d414a9d28e7ba5b5a596de',
-    'setuptools-0.6c11-py2.4.egg': 'bd639f9b0eac4c42497034dec2ec0c2b',
-    'setuptools-0.6c11-py2.5.egg': '64c94f3bf7a72a13ec83e0b24f2749b2',
-    'setuptools-0.6c11-py2.6.egg': 'bfa92100bd772d5a213eedd356d64086',
-    'setuptools-0.6c2-py2.3.egg': 'f0064bf6aa2b7d0f3ba0b43f20817c27',
-    'setuptools-0.6c2-py2.4.egg': '616192eec35f47e8ea16cd6a122b7277',
-    'setuptools-0.6c3-py2.3.egg': 'f181fa125dfe85a259c9cd6f1d7b78fa',
-    'setuptools-0.6c3-py2.4.egg': 'e0ed74682c998bfb73bf803a50e7b71e',
-    'setuptools-0.6c3-py2.5.egg': 'abef16fdd61955514841c7c6bd98965e',
-    'setuptools-0.6c4-py2.3.egg': 'b0b9131acab32022bfac7f44c5d7971f',
-    'setuptools-0.6c4-py2.4.egg': '2a1f9656d4fbf3c97bf946c0a124e6e2',
-    'setuptools-0.6c4-py2.5.egg': '8f5a052e32cdb9c72bcf4b5526f28afc',
-    'setuptools-0.6c5-py2.3.egg': 'ee9fd80965da04f2f3e6b3576e9d8167',
-    'setuptools-0.6c5-py2.4.egg': 'afe2adf1c01701ee841761f5bcd8aa64',
-    'setuptools-0.6c5-py2.5.egg': 'a8d3f61494ccaa8714dfed37bccd3d5d',
-    'setuptools-0.6c6-py2.3.egg': '35686b78116a668847237b69d549ec20',
-    'setuptools-0.6c6-py2.4.egg': '3c56af57be3225019260a644430065ab',
-    'setuptools-0.6c6-py2.5.egg': 'b2f8a7520709a5b34f80946de5f02f53',
-    'setuptools-0.6c7-py2.3.egg': '209fdf9adc3a615e5115b725658e13e2',
-    'setuptools-0.6c7-py2.4.egg': '5a8f954807d46a0fb67cf1f26c55a82e',
-    'setuptools-0.6c7-py2.5.egg': '45d2ad28f9750e7434111fde831e8372',
-    'setuptools-0.6c8-py2.3.egg': '50759d29b349db8cfd807ba8303f1902',
-    'setuptools-0.6c8-py2.4.egg': 'cba38d74f7d483c06e9daa6070cce6de',
-    'setuptools-0.6c8-py2.5.egg': '1721747ee329dc150590a58b3e1ac95b',
-    'setuptools-0.6c9-py2.3.egg': 'a83c4020414807b496e4cfbe08507c03',
-    'setuptools-0.6c9-py2.4.egg': '260a2be2e5388d66bdaee06abec6342a',
-    'setuptools-0.6c9-py2.5.egg': 'fe67c3e5a17b12c0e7c541b7ea43a8e6',
-    'setuptools-0.6c9-py2.6.egg': 'ca37b1ff16fa2ede6e19383e7b59245a',
-}
-
-import sys, os
-try: from hashlib import md5
-except ImportError: from md5 import md5
-
-def _validate_md5(egg_name, data):
-    if egg_name in md5_data:
-        digest = md5(data).hexdigest()
-        if digest != md5_data[egg_name]:
-            print >>sys.stderr, (
-                "md5 validation of %s failed!  (Possible download problem?)"
-                % egg_name
-            )
-            sys.exit(2)
-    return data
-
-def use_setuptools(
-    version=DEFAULT_VERSION, download_base=DEFAULT_URL, to_dir=os.curdir,
-    download_delay=15
-):
-    """Automatically find/download setuptools and make it available on sys.path
-
-    `version` should be a valid setuptools version number that is available
-    as an egg for download under the `download_base` URL (which should end with
-    a '/').  `to_dir` is the directory where setuptools will be downloaded, if
-    it is not already available.  If `download_delay` is specified, it should
-    be the number of seconds that will be paused before initiating a download,
-    should one be required.  If an older version of setuptools is installed,
-    this routine will print a message to ``sys.stderr`` and raise SystemExit in
-    an attempt to abort the calling script.
-    """
-    was_imported = 'pkg_resources' in sys.modules or 'setuptools' in sys.modules
-    def do_download():
-        egg = download_setuptools(version, download_base, to_dir, download_delay)
-        sys.path.insert(0, egg)
-        import setuptools; setuptools.bootstrap_install_from = egg
-    try:
-        import pkg_resources
-    except ImportError:
-        return do_download()       
-    try:
-        pkg_resources.require("setuptools>="+version); return
-    except pkg_resources.VersionConflict, e:
-        if was_imported:
-            print >>sys.stderr, (
-            "The required version of setuptools (>=%s) is not available, and\n"
-            "can't be installed while this script is running. Please install\n"
-            " a more recent version first, using 'easy_install -U setuptools'."
-            "\n\n(Currently using %r)"
-            ) % (version, e.args[0])
-            sys.exit(2)
-    except pkg_resources.DistributionNotFound:
-        pass
-
-    del pkg_resources, sys.modules['pkg_resources']    # reload ok
-    return do_download()
-
-def download_setuptools(
-    version=DEFAULT_VERSION, download_base=DEFAULT_URL, to_dir=os.curdir,
-    delay = 15
-):
-    """Download setuptools from a specified location and return its filename
-
-    `version` should be a valid setuptools version number that is available
-    as an egg for download under the `download_base` URL (which should end
-    with a '/'). `to_dir` is the directory where the egg will be downloaded.
-    `delay` is the number of seconds to pause before an actual download attempt.
-    """
-    import urllib2, shutil
-    egg_name = "setuptools-%s-py%s.egg" % (version,sys.version[:3])
-    url = download_base + egg_name
-    saveto = os.path.join(to_dir, egg_name)
-    src = dst = None
-    if not os.path.exists(saveto):  # Avoid repeated downloads
-        try:
-            from distutils import log
-            if delay:
-                log.warn("""
----------------------------------------------------------------------------
-This script requires setuptools version %s to run (even to display
-help).  I will attempt to download it for you (from
-%s), but
-you may need to enable firewall access for this script first.
-I will start the download in %d seconds.
-
-(Note: if this machine does not have network access, please obtain the file
-
-   %s
-
-and place it in this directory before rerunning this script.)
----------------------------------------------------------------------------""",
-                    version, download_base, delay, url
-                ); from time import sleep; sleep(delay)
-            log.warn("Downloading %s", url)
-            src = urllib2.urlopen(url)
-            # Read/write all in one block, so we don't create a corrupt file
-            # if the download is interrupted.
-            data = _validate_md5(egg_name, src.read())
-            dst = open(saveto,"wb"); dst.write(data)
-        finally:
-            if src: src.close()
-            if dst: dst.close()
-    return os.path.realpath(saveto)
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-def main(argv, version=DEFAULT_VERSION):
-    """Install or upgrade setuptools and EasyInstall"""
-    try:
-        import setuptools
-    except ImportError:
-        egg = None
-        try:
-            egg = download_setuptools(version, delay=0)
-            sys.path.insert(0,egg)
-            from setuptools.command.easy_install import main
-            return main(list(argv)+[egg])   # we're done here
-        finally:
-            if egg and os.path.exists(egg):
-                os.unlink(egg)
-    else:
-        if setuptools.__version__ == '0.0.1':
-            print >>sys.stderr, (
-            "You have an obsolete version of setuptools installed.  Please\n"
-            "remove it from your system entirely before rerunning this script."
-            )
-            sys.exit(2)
-
-    req = "setuptools>="+version
-    import pkg_resources
-    try:
-        pkg_resources.require(req)
-    except pkg_resources.VersionConflict:
-        try:
-            from setuptools.command.easy_install import main
-        except ImportError:
-            from easy_install import main
-        main(list(argv)+[download_setuptools(delay=0)])
-        sys.exit(0) # try to force an exit
-    else:
-        if argv:
-            from setuptools.command.easy_install import main
-            main(argv)
-        else:
-            print "Setuptools version",version,"or greater has been installed."
-            print '(Run "ez_setup.py -U setuptools" to reinstall or upgrade.)'
-
-def update_md5(filenames):
-    """Update our built-in md5 registry"""
-
-    import re
-
-    for name in filenames:
-        base = os.path.basename(name)
-        f = open(name,'rb')
-        md5_data[base] = md5(f.read()).hexdigest()
-        f.close()
-
-    data = ["    %r: %r,\n" % it for it in md5_data.items()]
-    data.sort()
-    repl = "".join(data)
-
-    import inspect
-    srcfile = inspect.getsourcefile(sys.modules[__name__])
-    f = open(srcfile, 'rb'); src = f.read(); f.close()
-
-    match = re.search("\nmd5_data = {\n([^}]+)}", src)
-    if not match:
-        print >>sys.stderr, "Internal error!"
-        sys.exit(2)
-
-    src = src[:match.start(1)] + repl + src[match.end(1):]
-    f = open(srcfile,'w')
-    f.write(src)
-    f.close()
-
-
-if __name__=='__main__':
-    if len(sys.argv)>2 and sys.argv[1]=='--md5update':
-        update_md5(sys.argv[2:])
-    else:
-        main(sys.argv[1:])
-
-
-
-
-
-

=== modified file 'setup.py'
--- setup.py	2016-03-01 13:09:28 +0000
+++ setup.py	2017-06-09 20:57:05 +0000
@@ -2,10 +2,10 @@
 import os
 import re
 
-import ez_setup
-ez_setup.use_setuptools()
-
-from setuptools import setup, Extension, find_packages
+try:
+    from setuptools import setup, Extension
+except ImportError:
+    from distutils.core import setup, Extension
 
 
 if os.path.isfile("MANIFEST"):
@@ -19,12 +19,20 @@
                     open("storm/__init__.py").read()).group(1)
 
 
+def find_packages():
+    # implement a simple find_packages so we don't have to depend on
+    # setuptools
+    packages = []
+    for directory, subdirectories, files in os.walk("storm"):
+        if '__init__.py' in files:
+            packages.append(directory.replace(os.sep, '.'))
+    return packages
+
+
 setup(
     name="storm",
     version=VERSION,
-    description=(
-        "Storm is an object-relational mapper (ORM) for Python "
-        "developed at Canonical."),
+    description="Storm is an object-relational mapper (ORM) for Python developed at Canonical.",
     author="Gustavo Niemeyer",
     author_email="[e-mail]",
     maintainer="Storm Developers",
@@ -33,42 +41,18 @@
     url="https://storm.canonical.com",
     download_url="https://launchpad.net/storm/+download",
     packages=find_packages(),
+    zip_safe=False,
+    include_package_data=True,
     package_data={"": ["*.zcml"]},
     classifiers=[
         "Development Status :: 5 - Production/Stable",
         "Intended Audience :: Developers",
-        ("License :: OSI Approved :: GNU Library or "
-         "Lesser General Public License (LGPL)"),
+        "License :: OSI Approved :: GNU Library or Lesser General Public License (LGPL)",
         "Programming Language :: Python",
         "Topic :: Database",
         "Topic :: Database :: Front-Ends",
         "Topic :: Software Development :: Libraries :: Python Modules",
     ],
     ext_modules=(BUILD_CEXTENSIONS and
-                 [Extension("storm.cextensions", ["storm/cextensions.c"])]),
-    # The following options are specific to setuptools but ignored (with a
-    # warning) by distutils.
-    include_package_data=True,
-    zip_safe=False,
-    test_suite = "tests.find_tests",
-    tests_require=[
-        # Versions based on Lucid, where packaged.
-        "fixtures >= 0.3.5",
-        # pgbouncer (the Python module) is not yet packaged in Ubuntu.
-        "pgbouncer >= 0.0.7",
-        "psycopg2 >= 2.0.13",
-        "testresources >= 0.2.4",
-        "testtools >= 0.9.8",
-        # timeline is not yet packaged in Ubuntu.
-        "timeline >= 0.0.2",
-        "transaction >= 1.0.0",
-        "twisted >= 10.0.0",
-        "zope.component >= 3.8.0",
-        # zope.component 3.11.0 requires a version of zope.interface that no
-        # version of Ubuntu yet packages. The following rule exists for the
-        # sake of convenience rather than necessity, for the situation where
-        # zope.interface is installed via a package but zope.component is not.
-        "zope.component < 3.11.0",
-        "zope.security >= 3.7.2",
-        ],
-    )
+                 [Extension("storm.cextensions", ["storm/cextensions.c"])])
+)

=== modified file 'storm/__init__.py'
--- storm/__init__.py	2013-06-28 09:56:58 +0000
+++ storm/__init__.py	2017-06-09 20:57:05 +0000
@@ -19,6 +19,8 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
+from builtins import str
+from builtins import object
 import os
 
 
@@ -53,6 +55,6 @@
     try:
         from storm import cextensions
         has_cextensions = True
-    except ImportError, e:
+    except ImportError as e:
         if "cextensions" not in str(e):
            raise

=== modified file 'storm/base.py'
--- storm/base.py	2007-07-05 20:29:25 +0000
+++ storm/base.py	2017-06-09 20:57:05 +0000
@@ -18,18 +18,19 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
+from builtins import object
 from storm.properties import PropertyPublisherMeta
+from future.utils import with_metaclass
 
 
 __all__ = ["Storm"]
 
 
-class Storm(object):
+class Storm(with_metaclass(PropertyPublisherMeta, object)):
     """An optional base class for objects stored in a Storm Store.
 
     It causes your subclasses to be associated with a Storm
     PropertyRegistry. It is necessary to use this if you want to
     specify References with strings.
     """
-    __metaclass__ = PropertyPublisherMeta
 

=== modified file 'storm/cache.py'
--- storm/cache.py	2009-02-16 10:44:31 +0000
+++ storm/cache.py	2017-06-09 20:57:05 +0000
@@ -1,3 +1,4 @@
+from builtins import object
 import itertools
 
 
@@ -140,8 +141,8 @@
         objects, but no more than twice that number.
         """
         self._size = size
-        cache = itertools.islice(itertools.chain(self._new_cache.iteritems(),
-                                                 self._old_cache.iteritems()),
+        cache = itertools.islice(itertools.chain(iter(self._new_cache.items()),
+                                                 iter(self._old_cache.items())),
                                  0, size)
         self._new_cache = dict(cache)
         self._old_cache.clear()

=== modified file 'storm/cextensions.c'
--- storm/cextensions.c	2012-05-31 04:14:32 +0000
+++ storm/cextensions.c	2017-06-09 20:57:05 +0000
@@ -23,14 +23,15 @@
 #include <Python.h>
 #include <structmember.h>
 
-
-#if PY_VERSION_HEX < 0x02050000 && !defined(PY_SSIZE_T_MIN)
-typedef int Py_ssize_t;
-#define PY_SSIZE_T_MAX INT_MAX
-#define PY_SSIZE_T_MIN INT_MIN
+#if PY_VERSION_HEX >= 0x03000000
+#define PyInt_FromLong PyLong_FromLong
+#define PyText_AsString _PyUnicode_AsString
+#define PyString_CheckExact(o) 0
+#else
+/* 2.x */
+#define PyText_AsString PyString_AsString
 #endif
 
-
 #define CATCH(error_value, expression) \
         do { \
             if ((expression) == error_value) {\
@@ -46,57 +47,6 @@
             Py_DECREF(tmp); \
         } while(0)
 
-
-/* Python 2.4 does not include the PySet_* API, so provide a minimal
-   implementation for the calls we care about. */
-#if PY_VERSION_HEX < 0x02050000 && !defined(PySet_GET_SIZE)
-#  define PySet_GET_SIZE(so) \
-     ((PyDictObject *)((PySetObject *)so)->data)->ma_used
-static PyObject *
-PySet_New(PyObject *p)
-{
-    return PyObject_CallObject((PyObject *)&PySet_Type, NULL);
-}
-
-static int
-PySet_Add(PyObject *set, PyObject *key)
-{
-    PyObject *dict;
-
-    if (!PyType_IsSubtype(set->ob_type, &PySet_Type)) {
-        PyErr_BadInternalCall();
-        return -1;
-    }
-    dict = ((PySetObject *)set)->data;
-    return PyDict_SetItem(dict, key, Py_True);
-}
-
-static int
-PySet_Discard(PyObject *set, PyObject *key)
-{
-    PyObject *dict;
-    int result;
-
-    if (!PyType_IsSubtype(set->ob_type, &PySet_Type)) {
-        PyErr_BadInternalCall();
-        return -1;
-    }
-    dict = ((PySetObject *)set)->data;
-    result = PyDict_DelItem(dict, key);
-    if (result == 0) {
-        /* key found and removed */
-        result = 1;
-    } else {
-        if (PyErr_ExceptionMatches(PyExc_KeyError)) {
-            /* key not found */
-            PyErr_Clear();
-            result = 0;
-        }
-    }
-    return result;
-}
-#endif
-
 static PyObject *Undef = NULL;
 static PyObject *LazyValue = NULL;
 static PyObject *raise_none_error = NULL;
@@ -300,7 +250,7 @@
 EventSystem_dealloc(EventSystemObject *self)
 {
     EventSystem_clear(self);
-    self->ob_type->tp_free((PyObject *)self);
+    Py_TYPE(self)->tp_free((PyObject *)self);
 }
 
 static PyObject *
@@ -521,9 +471,8 @@
 };
 #undef OFFSETOF
 
-statichere PyTypeObject EventSystem_Type = {
-    PyObject_HEAD_INIT(NULL)
-    0,            /*ob_size*/
+static PyTypeObject EventSystem_Type = {
+    PyVarObject_HEAD_INIT(NULL, 0)
     "storm.variables.EventSystem",    /*tp_name*/
     sizeof(EventSystemObject), /*tp_basicsize*/
     0,            /*tp_itemsize*/
@@ -707,7 +656,7 @@
 Variable_dealloc(VariableObject *self)
 {
     Variable_clear(self);
-    self->ob_type->tp_free((PyObject *)self);
+    Py_TYPE(self)->tp_free((PyObject *)self);
 }
 
 static PyObject *
@@ -1065,7 +1014,7 @@
 
     /* variable = self.__class__.__new__(self.__class__) */
     noargs = PyTuple_New(0);
-    CATCH(NULL, variable = self->ob_type->tp_new(self->ob_type, noargs, NULL));
+    CATCH(NULL, variable = Py_TYPE(self)->tp_new(Py_TYPE(self), noargs, NULL));
 
     /* variable.set_state(self.get_state()) */
     CATCH(NULL,
@@ -1116,9 +1065,8 @@
 };
 #undef OFFSETOF
 
-statichere PyTypeObject Variable_Type = {
-    PyObject_HEAD_INIT(NULL)
-    0,            /*ob_size*/
+static PyTypeObject Variable_Type = {
+    PyVarObject_HEAD_INIT(NULL, 0)
     "storm.variables.Variable",    /*tp_name*/
     sizeof(VariableObject), /*tp_basicsize*/
     0,            /*tp_itemsize*/
@@ -1267,7 +1215,7 @@
 Compile_dealloc(CompileObject *self)
 {
     Compile_clear(self);
-    self->ob_type->tp_free((PyObject *)self);
+    Py_TYPE(self)->tp_free((PyObject *)self);
 }
 
 static PyObject *
@@ -1434,13 +1382,13 @@
     return NULL;
 }
 
-staticforward PyTypeObject Compile_Type;
+static PyTypeObject Compile_Type;
 
 static PyObject *
 Compile_create_child(CompileObject *self, PyObject *args)
 {
     /* return self.__class__(self) */
-    return PyObject_CallFunctionObjArgs((PyObject *)self->ob_type, self, NULL);
+    return PyObject_CallFunctionObjArgs((PyObject *)Py_TYPE(self), self, NULL);
 }
 
 static PyObject *
@@ -1538,7 +1486,7 @@
             if (repr) {
                 PyErr_Format(CompileError,
                              "Don't know how to compile type %s of %s",
-                             expr->ob_type->tp_name, PyString_AS_STRING(repr));
+                             expr->ob_type->tp_name, PyText_AsString(repr));
                 Py_DECREF(repr);
             }
             goto error;
@@ -1557,7 +1505,7 @@
                                                          state, NULL));
 
     /* if inner_precedence < outer_precedence: */
-    if (PyObject_Compare(inner_precedence, outer_precedence) == -1) {
+    if (PyObject_RichCompareBool(inner_precedence, outer_precedence, Py_LT)) {
         PyObject *args, *tmp;
 
         if (PyErr_Occurred())
@@ -1780,9 +1728,8 @@
 };
 #undef OFFSETOF
 
-statichere PyTypeObject Compile_Type = {
-    PyObject_HEAD_INIT(NULL)
-    0,            /*ob_size*/
+static PyTypeObject Compile_Type = {
+    PyVarObject_HEAD_INIT(NULL, 0)
     "storm.variables.Compile",    /*tp_name*/
     sizeof(CompileObject), /*tp_basicsize*/
     0,            /*tp_itemsize*/
@@ -2071,9 +2018,8 @@
     {NULL}
 };
 
-statichere PyTypeObject ObjectInfo_Type = {
-    PyObject_HEAD_INIT(NULL)
-    0,            /*ob_size*/
+static PyTypeObject ObjectInfo_Type = {
+    PyVarObject_HEAD_INIT(NULL, 0)
     "storm.info.ObjectInfo", /*tp_name*/
     sizeof(ObjectInfoObject), /*tp_basicsize*/
     0,            /*tp_itemsize*/
@@ -2176,11 +2122,9 @@
     return PyType_Ready(type);
 }
 
-DL_EXPORT(void)
-initcextensions(void)
+static int
+do_init(PyObject *module)
 {
-    PyObject *module;
-
     prepare_type(&EventSystem_Type);
     prepare_type(&Compile_Type);
     ObjectInfo_Type.tp_base = &PyDict_Type;
@@ -2188,7 +2132,6 @@
     prepare_type(&ObjectInfo_Type);
     prepare_type(&Variable_Type);
 
-    module = Py_InitModule3("cextensions", cextensions_methods, "");
     Py_INCREF(&Variable_Type);
 
 #define REGISTER_TYPE(name) \
@@ -2201,7 +2144,42 @@
     REGISTER_TYPE(ObjectInfo);
     REGISTER_TYPE(Compile);
     REGISTER_TYPE(EventSystem);
-}
+    return 0;
+}
+
+#if PY_VERSION_HEX < 0x03000000
+DL_EXPORT(void)
+initcextensions(void)
+{
+    PyObject *module;
+
+    module = Py_InitModule3("cextensions", cextensions_methods, "");
+    do_init(module);
+}
+#else
+static struct PyModuleDef cextensionsmodule = {
+    PyModuleDef_HEAD_INIT,
+    "cextensions",
+    NULL,
+    -1,
+    cextensions_methods,
+    NULL,
+    NULL,
+    NULL,
+    NULL
+};
+
+PyMODINIT_FUNC
+PyInit_cextensions(void)
+{
+    PyObject *module = PyModule_Create(&cextensionsmodule);
+    if (module == NULL)
+        return NULL;
+    do_init(module);
+    return module;
+}
+#endif
+
 
 /* vim:ts=4:sw=4:et
 */

=== modified file 'storm/database.py'
--- storm/database.py	2015-06-15 13:42:07 +0000
+++ storm/database.py	2017-06-09 20:57:05 +0000
@@ -25,6 +25,11 @@
 supported in modules in L{storm.databases}.
 """
 
+from builtins import str
+from builtins import range
+from builtins import object
+import six
+
 from storm.expr import Expr, State, compile
 # Circular import: imported at the end of the module.
 # from storm.tracer import trace
@@ -318,7 +323,7 @@
                         self._raw_connection.tpc_rollback()
                     else:
                         self._raw_connection.rollback()
-                except Error, exc:
+                except Error as exc:
                     if self.is_disconnection_error(exc):
                         self._raw_connection = None
                         self._state = STATE_RECONNECT
@@ -386,7 +391,7 @@
         """Complete the statement execution, along with result reports."""
         try:
             self._check_disconnect(raw_cursor.execute, *args)
-        except Exception, error:
+        except Exception as error:
             self._check_disconnect(
                 trace, "connection_raw_execute_error", self, raw_cursor,
                 statement, params or (), error)
@@ -402,7 +407,7 @@
             self._check_disconnect(
                 trace, "connection_raw_execute", self, raw_cursor,
                 statement, params or ())
-        except Exception, error:
+        except Exception as error:
             self._check_disconnect(
                 trace, "connection_raw_execute_error", self, raw_cursor,
                 statement, params or (), error)
@@ -423,7 +428,7 @@
         elif self._state == STATE_RECONNECT:
             try:
                 self._raw_connection = self._database.raw_connect()
-            except DatabaseError, exc:
+            except DatabaseError as exc:
                 self._state = STATE_DISCONNECTED
                 self._raw_connection = None
                 raise DisconnectionError(str(exc))
@@ -452,7 +457,7 @@
             'extra_disconnection_errors', ())
         try:
             return function(*args, **kwargs)
-        except Exception, exc:
+        except Exception as exc:
             if self.is_disconnection_error(exc, extra_disconnection_errors):
                 self._state = STATE_DISCONNECTED
                 self._raw_connection = None
@@ -544,7 +549,7 @@
         - "anything:..." Where 'anything' has previously been registered
           with L{register_scheme}.
     """
-    if isinstance(uri, basestring):
+    if isinstance(uri, six.string_types):
         uri = URI(uri)
     if uri.scheme in _database_schemes:
         factory = _database_schemes[uri.scheme]

=== modified file 'storm/databases/__init__.py'
--- storm/databases/__init__.py	2007-08-07 18:36:04 +0000
+++ storm/databases/__init__.py	2017-06-09 20:57:05 +0000
@@ -20,6 +20,7 @@
 #
 
 
+from builtins import object
 class Dummy(object):
     """Magic "infectious" class.
 
@@ -36,7 +37,7 @@
     def __add__(self, other):
         return self
 
-    def __nonzero__(self):
+    def __bool__(self):
         return False
 
 dummy = Dummy()

=== modified file 'storm/databases/mysql.py'
--- storm/databases/mysql.py	2015-06-15 12:02:12 +0000
+++ storm/databases/mysql.py	2017-06-09 20:57:05 +0000
@@ -18,6 +18,7 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
+from builtins import str
 from datetime import time, timedelta
 from array import array
 import sys
@@ -48,7 +49,7 @@
 @compile.when(Select)
 def compile_select_mysql(compile, select, state):
     if select.offset is not Undef and select.limit is Undef:
-        select.limit = sys.maxint
+        select.limit = sys.maxsize
     return compile_select(compile, select, state)
 
 @compile.when(SQLToken)

=== modified file 'storm/databases/postgres.py'
--- storm/databases/postgres.py	2016-04-28 11:57:12 +0000
+++ storm/databases/postgres.py	2017-06-09 20:57:05 +0000
@@ -19,6 +19,8 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
+from builtins import zip, str
+import six
 from datetime import datetime, date, time, timedelta
 import json
 
@@ -310,7 +312,7 @@
         Like L{Connection.raw_execute}, but encode the statement to
         UTF-8 if it is unicode.
         """
-        if type(statement) is unicode:
+        if type(statement) is six.text_type and six.PY2:
             # psycopg breaks with unicode statements.
             statement = statement.encode("UTF-8")
         return Connection.raw_execute(self, statement, params)
@@ -326,9 +328,9 @@
                 param = param.get(to_db=True)
             if isinstance(param, (datetime, date, time, timedelta)):
                 yield str(param)
-            elif isinstance(param, unicode):
+            elif isinstance(param, six.text_type) and six.PY2:
                 yield param.encode("UTF-8")
-            elif isinstance(param, str):
+            elif isinstance(param, six.binary_type):
                 yield psycopg2.Binary(param)
             else:
                 yield param
@@ -484,7 +486,7 @@
     __slots__ = ()
 
     def _loads(self, value):
-        if isinstance(value, str):
+        if isinstance(value, six.binary_type):
             # psycopg versions < 2.5 don't automatically convert JSON columns
             # to python objects, they return a string.
             #

=== modified file 'storm/databases/sqlite.py'
--- storm/databases/sqlite.py	2015-06-15 12:02:12 +0000
+++ storm/databases/sqlite.py	2017-06-09 20:57:05 +0000
@@ -18,6 +18,8 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
+from builtins import str
+import six
 from datetime import datetime, date, time, timedelta
 from time import sleep, time as now
 import sys
@@ -41,6 +43,7 @@
 
 
 install_exceptions(sqlite)
+buffer = buffer if six.PY2 else memoryview
 
 
 compile = compile.create_child()
@@ -51,9 +54,9 @@
         if sys.maxsize > 2**32:
             # On 64-bit platforms sqlite doesn't like maxint as LIMIT. See also
             # https://lists.ubuntu.com/archives/storm/2013-June/001492.html
-            select.limit = sys.maxint - 1
+            select.limit = sys.maxsize - 1
         else:
-            select.limit = sys.maxint
+            select.limit = sys.maxsize
     statement = compile_select(compile, select, state)
     if state.context is SELECT:
         # SQLite breaks with (SELECT ...) UNION (SELECT ...), so we
@@ -119,7 +122,7 @@
                 param = param.get(to_db=True)
             if isinstance(param, (datetime, date, time, timedelta)):
                 yield str(param)
-            elif isinstance(param, str):
+            elif isinstance(param, six.binary_type):
                 yield buffer(param)
             else:
                 yield param
@@ -157,7 +160,7 @@
         while True:
             try:
                 return Connection.raw_execute(self, statement, params)
-            except sqlite.OperationalError, e:
+            except sqlite.OperationalError as e:
                 if str(e) != "database is locked":
                     raise
                 elif now() - started < self._database._timeout:

=== modified file 'storm/event.py'
--- storm/event.py	2008-06-18 21:51:12 +0000
+++ storm/event.py	2017-06-09 20:57:05 +0000
@@ -18,6 +18,7 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
+from builtins import object
 import weakref
 
 from storm import has_cextensions

=== modified file 'storm/exceptions.py'
--- storm/exceptions.py	2015-11-23 15:03:53 +0000
+++ storm/exceptions.py	2017-06-09 20:57:05 +0000
@@ -19,11 +19,13 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 from abc import ABCMeta
+import six
 import types
-
-
-class StormError(Exception):
-    __metaclass__ = ABCMeta
+from future.utils import with_metaclass
+
+
+class StormError(with_metaclass(ABCMeta, Exception)):
+    pass
 
 
 class CompileError(StormError):
@@ -128,7 +130,7 @@
         self.message = message
 
     def __str__(self):
-	return ', '.join(
+        return ', '.join(
             [repr(element) for element in
              (self.message, self.statement, self.params)
              if element is not None])
@@ -144,8 +146,16 @@
                       DataError, NotSupportedError, InterfaceError):
         module_exception = getattr(module, exception.__name__, None)
         if (module_exception is not None and
-            isinstance(module_exception, (type, types.ClassType))):
-            # XXX This may need to be revisited when porting to Python 3 if
-            # virtual subclasses are still ignored for exception handling
-            # (https://bugs.python.org/issue12029).
-            exception.register(module_exception)
+            isinstance(module_exception, type)):
+            if six.PY2:
+                exception.register(module_exception)
+            else:
+                # XXX virtual subclasses are still ignored for exception handling
+                # (https://bugs.python.org/issue12029).
+                try:
+                    module_exception.__bases__ += (exception, )
+                except TypeError:
+                    tmp_exc = type(module_exception.__name__, (module_exception, ), {})
+                    setattr(module, module_exception.__name__, tmp_exc)
+                    module_exception = getattr(module, exception.__name__)
+                    module_exception.__bases__ += (exception, )

=== modified file 'storm/expr.py'
--- storm/expr.py	2016-05-13 18:55:24 +0000
+++ storm/expr.py	2017-06-09 20:57:05 +0000
@@ -18,6 +18,8 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
+from builtins import zip, range, object
+import six
 from decimal import Decimal
 from datetime import datetime, date, time, timedelta
 from weakref import WeakKeyDictionary
@@ -164,10 +166,10 @@
         expr_type = type(expr)
 
         if (expr_type is SQLRaw or
-            raw and (expr_type is str or expr_type is unicode)):
+            raw and (expr_type is six.binary_type or expr_type is six.text_type)):
             return expr
 
-        if token and (expr_type is str or expr_type is unicode):
+        if token and (expr_type is six.binary_type or expr_type is six.text_type):
             expr = SQLToken(expr)
 
         if state is None:
@@ -178,15 +180,15 @@
             compiled = []
             for subexpr in expr:
                 subexpr_type = type(subexpr)
-                if subexpr_type is SQLRaw or raw and (subexpr_type is str or
-                                                      subexpr_type is unicode):
+                if subexpr_type is SQLRaw or raw and (subexpr_type is six.binary_type or
+                                                      subexpr_type is six.text_type):
                     statement = subexpr
                 elif subexpr_type is tuple or subexpr_type is list:
                     state.precedence = outer_precedence
                     statement = self(subexpr, state, join, raw, token)
                 else:
-                    if token and (subexpr_type is unicode or
-                                  subexpr_type is str):
+                    if token and (subexpr_type is six.text_type or
+                                  subexpr_type is six.binary_type):
                         subexpr = SQLToken(subexpr)
                     statement = self._compile_single(subexpr, state,
                                                      outer_precedence)
@@ -216,7 +218,7 @@
                 "    return match" %
                 (",".join("_%d" % i for i in range(len(state.parameters))),
                  source))
-        exec code in namespace
+        exec(code, namespace)
         return namespace['closure'](state.parameters, bool)
 
 
@@ -303,17 +305,17 @@
 # --------------------------------------------------------------------
 # Builtin type support
 
[e-mail](str)
[e-mail](six.binary_type)
 def compile_str(compile, expr, state):
     state.parameters.append(RawStrVariable(expr))
     return "?"
 
[e-mail](unicode)
[e-mail](six.text_type)
 def compile_unicode(compile, expr, state):
     state.parameters.append(UnicodeVariable(expr))
     return "?"
 
[e-mail](int, long)
[e-mail](*six.integer_types)
 def compile_int(compile, expr, state):
     state.parameters.append(IntVariable(expr))
     return "?"
@@ -358,7 +360,7 @@
     return "NULL"
 
 
-@compile_python.when(str, unicode, int, long, float, type(None))
+@compile_python.when(float, type(None), *(six.string_types + six.integer_types))
 def compile_python_builtin(compile, expr, state):
     return repr(expr)
 
@@ -406,6 +408,7 @@
 
 class Comparable(object):
     __slots__ = ()
+    __hash__ = object.__hash__
 
     def __eq__(self, other):
         if other is not None and not isinstance(other, (Expr, Variable)):
@@ -477,6 +480,9 @@
             other = getattr(self, "variable_factory", Variable)(value=other)
         return Div(self, other)
 
+    __floordiv__ = __div__
+    __truediv__ = __div__
+
     def __mod__(self, other):
         if not isinstance(other, (Expr, Variable)):
             other = getattr(self, "variable_factory", Variable)(value=other)
@@ -508,19 +514,19 @@
         return Upper(self)
 
     def startswith(self, prefix):
-        if not isinstance(prefix, unicode):
+        if not isinstance(prefix, six.text_type):
             raise ExprError("Expected unicode argument, got %r" % type(prefix))
         pattern = prefix.translate(like_escape) + u"%"
         return Like(self, pattern, u"!")
 
     def endswith(self, suffix):
-        if not isinstance(suffix, unicode):
+        if not isinstance(suffix, six.text_type):
             raise ExprError("Expected unicode argument, got %r" % type(suffix))
         pattern = u"%" + suffix.translate(like_escape)
         return Like(self, pattern, u"!")
 
     def contains_string(self, substring):
-        if not isinstance(substring, unicode):
+        if not isinstance(substring, six.text_type):
             raise ExprError("Expected unicode argument, got %r" % type(substring))
         pattern = u"%" + substring.translate(like_escape) + u"%"
         return Like(self, pattern, u"!")
@@ -736,7 +742,7 @@
     state.context = EXPR
     values = insert.values
     if values is Undef:
-        values = [tuple(insert.map.itervalues())]
+        values = [tuple(insert.map.values())]
     if isinstance(values, Expr):
         compiled_values = compile(values, state)
     else:
@@ -1414,7 +1420,7 @@
 # --------------------------------------------------------------------
 # Plain SQL expressions.
 
-class SQLRaw(str):
+class SQLRaw(six.text_type):
     """Subtype to mark a string as something that shouldn't be compiled.
 
     This is handled internally by the compiler.
@@ -1422,7 +1428,7 @@
     __slots__ = ()
 
 
-class SQLToken(str):
+class SQLToken(six.text_type):
     """Marker for strings that should be considered as a single SQL token.
 
     These strings will be quoted, when needed.

=== modified file 'storm/info.py'
--- storm/info.py	2011-08-14 08:55:15 +0000
+++ storm/info.py	2017-06-09 20:57:05 +0000
@@ -18,8 +18,11 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
+from builtins import object
 from weakref import ref
 
+import six
+
 from storm.exceptions import ClassInfoError
 from storm.expr import Column, Desc, TABLE
 from storm.expr import compile, Table
@@ -73,7 +76,7 @@
 
         self.cls = cls
 
-        if isinstance(self.table, basestring):
+        if isinstance(self.table, six.string_types):
             self.table = Table(self.table)
 
         pairs = []
@@ -131,7 +134,7 @@
                 __order__ = (__order__,)
             self.default_order = []
             for item in __order__:
-                if isinstance(item, basestring):
+                if isinstance(item, six.string_types):
                     if item.startswith("-"):
                         prop = Desc(getattr(cls, item[1:]))
                     else:
@@ -146,6 +149,8 @@
     def __ne__(self, other):
         return self is not other
 
+    __hash__ = object.__hash__
+
 
 class ObjectInfo(dict):
 
@@ -192,7 +197,7 @@
         self.event.emit("object-deleted")
 
     def checkpoint(self):
-        for variable in self.variables.itervalues():
+        for variable in self.variables.values():
             variable.checkpoint()
 
 

=== modified file 'storm/properties.py'
--- storm/properties.py	2011-02-28 21:16:29 +0000
+++ storm/properties.py	2017-06-09 20:57:05 +0000
@@ -18,6 +18,8 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
+from builtins import zip
+from builtins import object
 from bisect import insort_left, bisect_left
 import weakref
 import sys
@@ -76,7 +78,7 @@
     def _detect_attr_name(self, used_cls):
         self_id = id(self)
         for cls in used_cls.__mro__:
-            for attr, prop in cls.__dict__.items():
+            for attr, prop in list(cls.__dict__.items()):
                 if id(prop) == self_id:
                     return attr
         raise RuntimeError("Property used in an unknown class")
@@ -218,7 +220,7 @@
 
     def __init__(self, name=None, primary=False, **kwargs):
         set_map = dict(kwargs.pop("map"))
-        get_map = dict((value, key) for key, value in set_map.items())
+        get_map = dict((value, key) for key, value in list(set_map.items()))
         if "set_map" in kwargs:
             set_map = dict(kwargs.pop("set_map"))
 
@@ -260,7 +262,7 @@
                 i += 1
         else:
             namespace_parts = ("." + namespace).split(".")
-            best_path_info = (0, sys.maxint)
+            best_path_info = (0, sys.maxsize)
             while i < l and self._properties[i][0].startswith(key):
                 path, prop_ref = self._properties[i]
                 prop = prop_ref()

=== modified file 'storm/references.py'
--- storm/references.py	2013-06-28 08:13:08 +0000
+++ storm/references.py	2017-06-09 20:57:05 +0000
@@ -18,8 +18,12 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
+from builtins import zip
+from builtins import object
 import weakref
 
+import six
+
 from storm.exceptions import (
     ClassInfoError, FeatureError, NoStoreError, WrongStoreError)
 from storm.store import Store, get_where_for_args, LostObjectError
@@ -206,6 +210,8 @@
     def __ne__(self, other):
         return Not(self == other)
 
+    __hash__ = object.__hash__
+
 
 class ReferenceSet(object):
 
@@ -621,8 +627,8 @@
         if setting:
             local_vars = local_info.variables
             remote_vars = remote_info.variables
-            pairs = zip(self._get_local_columns(local.__class__),
-                        self.remote_key)
+            pairs = list(zip(self._get_local_columns(local.__class__),
+                        self.remote_key))
             if self.on_remote:
                 local_has_changed = False
                 for local_column, remote_column in pairs:
@@ -910,7 +916,7 @@
     def resolve_one(self, property):
         if type(property) is tuple:
             return self.resolve(property)
-        elif isinstance(property, basestring):
+        elif isinstance(property, six.string_types):
             return self._resolve_string(property)
         elif isinstance(property, SuffixExpr):
             # XXX This covers cases like order_by=Desc("Bar.id"), see #620369.
@@ -938,14 +944,14 @@
 
 def _find_descriptor_class(used_cls, descr):
     for cls in used_cls.__mro__:
-        for attr, _descr in cls.__dict__.iteritems():
+        for attr, _descr in cls.__dict__.items():
             if _descr is descr:
                 return cls
     raise RuntimeError("Reference used in an unknown class")
 
 def _find_descriptor_obj(used_cls, descr):
     for cls in used_cls.__mro__:
-        for attr, _descr in cls.__dict__.iteritems():
+        for attr, _descr in cls.__dict__.items():
             if _descr is descr:
                 return getattr(cls, attr)
     raise RuntimeError("Reference used in an unknown class")

=== modified file 'storm/schema/patch.py'
--- storm/schema/patch.py	2014-12-12 11:14:47 +0000
+++ storm/schema/patch.py	2017-06-09 20:57:05 +0000
@@ -34,6 +34,9 @@
 'patch' table in the given L{Store}, and it won't be applied again.
 """
 
+from future.utils import raise_
+from builtins import str
+from builtins import object
 import sys
 import os
 import re
@@ -118,10 +121,8 @@
         except:
             type, value, traceback = sys.exc_info()
             patch_repr = getattr(module, "__file__", version)
-            raise BadPatchError, \
-                  "Patch %s failed: %s: %s" % \
-                      (patch_repr, type.__name__, str(value)), \
-                      traceback
+            msg = "Patch %s failed: %s: %s" % (patch_repr, type.__name__, str(value))
+            raise_(BadPatchError, msg, traceback)
         self._committer.commit()
 
     def apply_all(self):
@@ -244,7 +245,7 @@
         patch_directory = self._get_patch_directory()
         filenames = os.listdir(patch_directory)
         matches = [(format.match(fn), fn) for fn in filenames]
-        matches = sorted(filter(lambda x: x[0], matches),
+        matches = sorted([x for x in matches if x[0]],
                          key=lambda x: int(x[0].group(1)))
         return [int(match.group(1)) for match, filename in matches]
 

=== modified file 'storm/schema/schema.py'
--- storm/schema/schema.py	2015-01-26 09:57:25 +0000
+++ storm/schema/schema.py	2017-06-09 20:57:05 +0000
@@ -42,7 +42,9 @@
 where patch_module is a Python module containing database patches used to
 upgrade the schema over time.
 """
+from __future__ import print_function
 
+from builtins import object
 import types
 
 from storm.locals import StormError
@@ -96,7 +98,7 @@
             try:
                 store.execute(statement)
             except Exception:
-                print "Error running %s" % statement
+                print("Error running %s" % statement)
                 raise
         if self._autocommit:
             store.commit()
@@ -172,7 +174,7 @@
         except SchemaMissingError:
             # No schema at all. Create it from the ground.
             self.create(store)
-        except UnappliedPatchesError, error:
+        except UnappliedPatchesError as error:
             patch_applier.check_unknown()
             for version in error.unapplied_versions:
                 self.advance(store, version)

=== modified file 'storm/schema/sharding.py'
--- storm/schema/sharding.py	2014-12-28 11:51:53 +0000
+++ storm/schema/sharding.py	2017-06-09 20:57:05 +0000
@@ -41,6 +41,7 @@
 be at the same patch level. See L{storm.schema.patch.PatchSet}.
 """
 
+from builtins import object
 from storm.schema.schema import SchemaMissingError, UnappliedPatchesError
 
 
@@ -101,7 +102,7 @@
                 schema.check(store)
             except SchemaMissingError:
                 schema.create(store)
-            except UnappliedPatchesError, error:
+            except UnappliedPatchesError as error:
                 if not unapplied_versions:
                     unapplied_versions = error.unapplied_versions
                 elif unapplied_versions != error.unapplied_versions:

=== modified file 'storm/sqlobject.py'
--- storm/sqlobject.py	2011-10-17 15:59:25 +0000
+++ storm/sqlobject.py	2017-06-09 20:57:05 +0000
@@ -23,6 +23,8 @@
 L{SQLObjectBase} is the central point of compatibility.
 """
 
+from builtins import object
+import six
 import re
 import warnings
 
@@ -40,6 +42,7 @@
     compare_columns)
 from storm.tz import tzutc
 from storm import Undef
+from future.utils import with_metaclass
 
 
 __all__ = [
@@ -162,7 +165,7 @@
         dict["__storm_table__"] = table_name
 
         attr_to_prop = {}
-        for attr, prop in dict.items():
+        for attr, prop in list(dict.items()):
             attr_to_prop[attr] = attr
             if isinstance(prop, ForeignKey):
                 db_name = prop.kwargs.get("dbName", attr)
@@ -185,7 +188,7 @@
                         if obj is None:
                             raise SQLObjectNotFound
                         return obj
-                    func.func_name = method_name
+                    func.__name__ = method_name
                     dict[method_name] = classmethod(func)
             elif isinstance(prop, SQLMultipleJoin):
                 # Generate addFoo/removeFoo names.
@@ -205,7 +208,9 @@
 
 
         id_type = dict.setdefault("_idType", int)
-        id_cls = {int: Int, str: RawStr, unicode: AutoUnicode}[id_type]
+        id_cls = {int: Int,
+                  six.binary_type: RawStr,
+                  six.text_type: AutoUnicode}[id_type]
         dict["id"] = id_cls(id_name, primary=True, default=AutoReload)
         attr_to_prop[id_name] = "id"
 
@@ -222,7 +227,7 @@
         property_registry.add_property(obj, getattr(obj, "id"),
                                        "<table %s>" % table_name)
 
-        for fake_name, real_name in attr_to_prop.items():
+        for fake_name, real_name in list(attr_to_prop.items()):
             prop = getattr(obj, real_name)
             if fake_name != real_name:
                 property_registry.add_property(obj, prop, fake_name)
@@ -259,7 +264,7 @@
             return getattr(self._cls, attr)
 
 
-class SQLObjectBase(Storm):
+class SQLObjectBase(with_metaclass(SQLObjectMeta, Storm)):
     """The root class of all SQLObject-emulating classes in your application.
 
     The general strategy for using Storm's SQLObject emulation layer
@@ -269,7 +274,6 @@
     even be implemented as returning a global L{Store} instance. Then
     all database classes should subclass that class.
     """
-    __metaclass__ = SQLObjectMeta
 
     q = DotQ()
     _SO_creating = False
@@ -296,7 +300,7 @@
         self._init(None)
 
     def set(self, **kwargs):
-        for attr, value in kwargs.iteritems():
+        for attr, value in kwargs.items():
             setattr(self, attr, value)
 
     def destroySelf(self):
@@ -329,7 +333,7 @@
         if not isinstance(orderBy, (tuple, list)):
             orderBy = (orderBy,)
         for item in orderBy:
-            if isinstance(item, basestring):
+            if isinstance(item, six.string_types):
                 desc = item.startswith("-")
                 if desc:
                     item = item[1:]
@@ -404,7 +408,7 @@
 
     def _copy(self, **kwargs):
         copy = self.__class__(self._cls, **kwargs)
-        for name, value in self.__dict__.iteritems():
+        for name, value in self.__dict__.items():
             if name[1:] not in kwargs and name != "_finished_result_set":
                 setattr(copy, name, value)
         return copy
@@ -416,7 +420,7 @@
         if self._clause:
             args.append(self._clause)
 
-        for key, value in self._by.items():
+        for key, value in list(self._by.items()):
             args.append(getattr(self._cls, key) == value)
 
         tables = []
@@ -548,7 +552,7 @@
         result_set = self._without_prejoins()._result_set
         return item in result_set
 
-    def __nonzero__(self):
+    def __bool__(self):
         """Return C{True} if this result set contains any results.
 
         @note: This method is provided for compatibility with SQL Object.  For
@@ -603,7 +607,7 @@
         return self._copy(prejoinClauseTables=prejoinClauseTables)
 
     def sum(self, attribute):
-        if isinstance(attribute, basestring):
+        if isinstance(attribute, six.string_types):
             attribute = SQL(attribute)
         result_set = self._without_prejoins()._result_set
         return result_set.sum(attribute)
@@ -679,9 +683,9 @@
     __slots__ = ()
 
     def parse_set(self, value, from_db):
-        if not isinstance(value, basestring):
+        if not isinstance(value, six.string_types):
             raise TypeError("Expected basestring, found %s" % repr(type(value)))
-        return unicode(value)
+        return six.text_type(value)
 
 class AutoUnicode(SimpleProperty):
     variable_class = AutoUnicodeVariable

=== modified file 'storm/store.py'
--- storm/store.py	2015-04-20 08:46:56 +0000
+++ storm/store.py	2017-06-09 20:57:05 +0000
@@ -24,6 +24,8 @@
 This module contains the highest-level ORM interface in Storm.
 """
 
+from builtins import zip, object
+import six
 from copy import copy
 from weakref import WeakValueDictionary
 from operator import itemgetter
@@ -470,7 +472,7 @@
         self._dirty = flushing
 
         predecessors = {}
-        for (before_info, after_info), n in self._order.iteritems():
+        for (before_info, after_info), n in self._order.items():
             if n > 0:
                 before_set = predecessors.get(after_info)
                 if before_set is None:
@@ -849,7 +851,7 @@
             del obj_info["primary_vars"]
 
     def _iter_alive(self):
-        return self._alive.values()
+        return list(self._alive.values())
 
     def _enable_change_notification(self, obj_info):
         obj_info.event.emit("start-tracking-changes", self._event)
@@ -1003,7 +1005,7 @@
             L{ResultSet} will be returned appropriately modified with
             C{OFFSET} and C{LIMIT} clauses.
         """
-        if isinstance(index, (int, long)):
+        if isinstance(index, six.integer_types):
             if index == 0:
                 result_set = self
             else:
@@ -1377,7 +1379,7 @@
                                    "expression: %r" % repr(expr.expr2))
             changes[expr.expr1] = expr.expr2
 
-        for key, value in kwargs.items():
+        for key, value in list(kwargs.items()):
             column = getattr(cls, key)
             if value is None:
                 changes[column] = None
@@ -1402,7 +1404,7 @@
                     for column in changes:
                         obj_info.variables[column].set(AutoReload)
         else:
-            changes = changes.items()
+            changes = list(changes.items())
             for obj in cached:
                 for column, value in changes:
                     variables = get_obj_info(obj).variables
@@ -1791,7 +1793,7 @@
         if cls is None:
             raise FeatureError("Can't determine class that keyword "
                                "arguments are associated with")
-        for key, value in kwargs.items():
+        for key, value in list(kwargs.items()):
             equals.append(getattr(cls, key) == value)
     if equals:
         return And(*equals)

=== modified file 'storm/tracer.py'
--- storm/tracer.py	2012-06-28 13:08:48 +0000
+++ storm/tracer.py	2017-06-09 20:57:05 +0000
@@ -1,3 +1,5 @@
+from builtins import range, object
+import six
 from datetime import datetime
 import re
 import sys
@@ -169,7 +171,7 @@
             # string parameters which represent encoded binary data.
             render_params = []
             for param in query_params:
-                if isinstance(param, unicode):
+                if isinstance(param, six.text_type):
                     render_params.append(repr(param.encode('utf8')))
                 else:
                     render_params.append(repr(param))

=== modified file 'storm/twisted/testing.py'
--- storm/twisted/testing.py	2011-11-30 14:16:50 +0000
+++ storm/twisted/testing.py	2017-06-09 20:57:05 +0000
@@ -1,3 +1,4 @@
+from builtins import object
 import transaction
 
 from twisted.python.failure import Failure

=== modified file 'storm/twisted/transact.py'
--- storm/twisted/transact.py	2011-12-07 10:39:57 +0000
+++ storm/twisted/transact.py	2017-06-09 20:57:05 +0000
@@ -1,3 +1,4 @@
+from builtins import object
 import time
 import random
 import transaction
@@ -75,7 +76,7 @@
             try:
                 result = function(*args, **kwargs)
                 self._transaction.commit()
-            except RETRIABLE_ERRORS, error:
+            except RETRIABLE_ERRORS as error:
                 if isinstance(error, DisconnectionError):
                     # If we got a disconnection, calling rollback may not be
                     # enough because psycopg2 doesn't necessarily use the

=== modified file 'storm/tz.py'
--- storm/tz.py	2007-08-07 18:36:04 +0000
+++ storm/tz.py	2017-06-09 20:57:05 +0000
@@ -7,6 +7,10 @@
 __author__ = "Gustavo Niemeyer <[e-mail]>"
 __license__ = "PSF License"
 
+from builtins import range
+from builtins import object
+import six
+
 import datetime
 import struct
 import time
@@ -75,7 +79,7 @@
 
     def __repr__(self):
         return "%s(%s, %s)" % (self.__class__.__name__,
-                               `self._name`,
+                               repr(self._name),
                                self._offset.days*86400+self._offset.seconds)
 
     __reduce__ = object.__reduce__
@@ -161,7 +165,7 @@
         for attr in self.__slots__:
             value = getattr(self, attr)
             if value is not None:
-                l.append("%s=%s" % (attr, `value`))
+                l.append("%s=%s" % (attr, repr(value)))
         return "%s(%s)" % (self.__class__.__name__, ", ".join(l))
 
     def __eq__(self, other):
@@ -194,13 +198,13 @@
     # ftp://elsie.nci.nih.gov/pub/tz*.tar.gz
 
     def __init__(self, fileobj):
-        if isinstance(fileobj, basestring):
+        if isinstance(fileobj, six.string_types):
             self._filename = fileobj
             fileobj = open(fileobj)
         elif hasattr(fileobj, "name"):
             self._filename = fileobj.name
         else:
-            self._filename = `fileobj`
+            self._filename = repr(fileobj)
 
         # From tzfile(5):
         #
@@ -213,7 +217,7 @@
         # of the value is written first).
 
         if fileobj.read(4) != "TZif":
-            raise ValueError, "magic not found"
+            raise ValueError("magic not found")
 
         fileobj.read(16)
 
@@ -465,11 +469,11 @@
 
 
     def __repr__(self):
-        return "%s(%s)" % (self.__class__.__name__, `self._filename`)
+        return "%s(%s)" % (self.__class__.__name__, repr(self._filename))
 
     def __reduce__(self):
         if not os.path.isfile(self._filename):
-            raise ValueError, "Unpickable %s class" % self.__class__.__name__
+            raise ValueError("Unpickable %s class" % self.__class__.__name__)
         return (self.__class__, (self._filename,))
 
 class tzrange(datetime.tzinfo):
@@ -561,7 +565,7 @@
 
         res = parser._parsetz(s)
         if res is None:
-            raise ValueError, "unknown string format"
+            raise ValueError("unknown string format")
 
         # We must initialize it first, since _delta() needs
         # _std_offset and _dst_offset set. Use False in start/end
@@ -615,9 +619,9 @@
         return relativedelta.relativedelta(**kwargs)
 
     def __repr__(self):
-        return "%s(%s)" % (self.__class__.__name__, `self._s`)
+        return "%s(%s)" % (self.__class__.__name__, repr(self._s))
 
-class _tzicalvtzcomp:
+class _tzicalvtzcomp(object):
     def __init__(self, tzoffsetfrom, tzoffsetto, isdst,
                        tzname=None, rrule=None):
         self.tzoffsetfrom = datetime.timedelta(seconds=tzoffsetfrom)
@@ -685,45 +689,45 @@
         return self._find_comp(dt).tzname
 
     def __repr__(self):
-        return "<tzicalvtz %s>" % `self._tzid`
+        return "<tzicalvtz %s>" % repr(self._tzid)
 
     __reduce__ = object.__reduce__
 
-class tzical:
+class tzical(object):
     def __init__(self, fileobj):
         global rrule
         if not rrule:
             from dateutil import rrule
 
-        if isinstance(fileobj, basestring):
+        if isinstance(fileobj, six.string_types):
             self._s = fileobj
             fileobj = open(fileobj)
         elif hasattr(fileobj, "name"):
             self._s = fileobj.name
         else:
-            self._s = `fileobj`
+            self._s = repr(fileobj)
 
         self._vtz = {}
 
         self._parse_rfc(fileobj.read())
 
     def keys(self):
-        return self._vtz.keys()
+        return list(self._vtz.keys())
 
     def get(self, tzid=None):
         if tzid is None:
-            keys = self._vtz.keys()
+            keys = list(self._vtz.keys())
             if len(keys) == 0:
-                raise "no timezones defined"
+                raise Exception("no timezones defined")
             elif len(keys) > 1:
-                raise "more than one timezone available"
+                raise Exception("more than one timezone available")
             tzid = keys[0]
         return self._vtz.get(tzid)
 
     def _parse_offset(self, s):
         s = s.strip()
         if not s:
-            raise ValueError, "empty offset"
+            raise ValueError("empty offset")
         if s[0] in ('+', '-'):
             signal = (-1,+1)[s[0]=='+']
             s = s[1:]
@@ -734,12 +738,12 @@
         elif len(s) == 6:
             return (int(s[:2])*3600+int(s[2:4])*60+int(s[4:]))*signal
         else:
-            raise ValueError, "invalid offset: "+s
+            raise ValueError("invalid offset: "+s)
 
     def _parse_rfc(self, s):
         lines = s.splitlines()
         if not lines:
-            raise ValueError, "empty string"
+            raise ValueError("empty string")
 
         # Unfold
         i = 0
@@ -763,7 +767,7 @@
             name, value = line.split(':', 1)
             parms = name.split(';')
             if not parms:
-                raise ValueError, "empty property name"
+                raise ValueError("empty property name")
             name = parms[0].upper()
             parms = parms[1:]
             if invtz:
@@ -772,7 +776,7 @@
                         # Process component
                         pass
                     else:
-                        raise ValueError, "unknown component: "+value
+                        raise ValueError("unknown component: "+value)
                     comptype = value
                     founddtstart = False
                     tzoffsetfrom = None
@@ -782,27 +786,21 @@
                 elif name == "END":
                     if value == "VTIMEZONE":
                         if comptype:
-                            raise ValueError, \
-                                  "component not closed: "+comptype
+                            raise ValueError("component not closed: "+comptype)
                         if not tzid:
-                            raise ValueError, \
-                                  "mandatory TZID not found"
+                            raise ValueError("mandatory TZID not found")
                         if not comps:
-                            raise ValueError, \
-                                  "at least one component is needed"
+                            raise ValueError("at least one component is needed")
                         # Process vtimezone
                         self._vtz[tzid] = _tzicalvtz(tzid, comps)
                         invtz = False
                     elif value == comptype:
                         if not founddtstart:
-                            raise ValueError, \
-                                  "mandatory DTSTART not found"
+                            raise ValueError("mandatory DTSTART not found")
                         if tzoffsetfrom is None:
-                            raise ValueError, \
-                                  "mandatory TZOFFSETFROM not found"
+                            raise ValueError("mandatory TZOFFSETFROM not found")
                         if tzoffsetto is None:
-                            raise ValueError, \
-                                  "mandatory TZOFFSETFROM not found"
+                            raise ValueError("mandatory TZOFFSETFROM not found")
                         # Process component
                         rr = None
                         if rrulelines:
@@ -816,8 +814,7 @@
                         comps.append(comp)
                         comptype = None
                     else:
-                        raise ValueError, \
-                              "invalid component end: "+value
+                        raise ValueError("invalid component end: "+value)
                 elif comptype:
                     if name == "DTSTART":
                         rrulelines.append(line)
@@ -826,40 +823,36 @@
                         rrulelines.append(line)
                     elif name == "TZOFFSETFROM":
                         if parms:
-                            raise ValueError, \
-                                  "unsupported %s parm: %s "%(name, parms[0])
+                            raise ValueError("unsupported %s parm: %s "%(name, parms[0]))
                         tzoffsetfrom = self._parse_offset(value)
                     elif name == "TZOFFSETTO":
                         if parms:
-                            raise ValueError, \
-                                  "unsupported TZOFFSETTO parm: "+parms[0]
+                            raise ValueError("unsupported TZOFFSETTO parm: "+parms[0])
                         tzoffsetto = self._parse_offset(value)
                     elif name == "TZNAME":
                         if parms:
-                            raise ValueError, \
-                                  "unsupported TZNAME parm: "+parms[0]
+                            raise ValueError("unsupported TZNAME parm: "+parms[0])
                         tzname = value
                     elif name == "COMMENT":
                         pass
                     else:
-                        raise ValueError, "unsupported property: "+name
+                        raise ValueError("unsupported property: "+name)
                 else:
                     if name == "TZID":
                         if parms:
-                            raise ValueError, \
-                                  "unsupported TZID parm: "+parms[0]
+                            raise ValueError("unsupported TZID parm: "+parms[0])
                         tzid = value
                     elif name in ("TZURL", "LAST-MODIFIED", "COMMENT"):
                         pass
                     else:
-                        raise ValueError, "unsupported property: "+name
+                        raise ValueError("unsupported property: "+name)
             elif name == "BEGIN" and value == "VTIMEZONE":
                 tzid = None
                 comps = []
                 invtz = True
 
     def __repr__(self):
-        return "%s(%s)" % (self.__class__.__name__, `self._s`)
+        return "%s(%s)" % (self.__class__.__name__, repr(self._s))
 
 if sys.platform != "win32":
     TZFILES = ["/etc/localtime", "localtime"]

=== modified file 'storm/uri.py'
--- storm/uri.py	2008-01-30 13:03:27 +0000
+++ storm/uri.py	2017-06-09 20:57:05 +0000
@@ -18,7 +18,12 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-from urllib import quote
+from future import standard_library
+standard_library.install_aliases()
+from builtins import chr
+from builtins import str
+from builtins import object
+from urllib.parse import quote
 
 from storm.exceptions import URIError
 
@@ -102,7 +107,7 @@
             append(escape(self.database, "/"))
         if self.options:
             options = ["%s=%s" % (escape(key), escape(value))
-                       for key, value in sorted(self.options.iteritems())]
+                       for key, value in sorted(self.options.items())]
             append("?")
             append("&".join(options))
         return "".join(tokens)

=== modified file 'storm/variables.py'
--- storm/variables.py	2011-09-13 10:13:46 +0000
+++ storm/variables.py	2017-06-09 20:57:05 +0000
@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 #
 # Copyright (c) 2006, 2007 Canonical
 #
@@ -18,9 +19,13 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
+from future import standard_library
+standard_library.install_aliases()
+from builtins import object
+import six
 from datetime import datetime, date, time, timedelta
 from decimal import Decimal
-import cPickle as pickle
+import pickle as pickle
 import re
 try:
     import uuid
@@ -31,6 +36,7 @@
 from storm.exceptions import NoneError
 from storm import Undef, has_cextensions
 
+buffer = buffer if six.PY2 else memoryview
 
 __all__ = [
     "VariableFactory",
@@ -329,7 +335,7 @@
     __slots__ = ()
 
     def parse_set(self, value, from_db):
-        if not isinstance(value, (int, long, float, Decimal)):
+        if not isinstance(value, six.integer_types + (float, Decimal)):
             raise TypeError("Expected bool, found %r: %r"
                             % (type(value), value))
         return bool(value)
@@ -339,7 +345,7 @@
     __slots__ = ()
 
     def parse_set(self, value, from_db):
-        if not isinstance(value, (int, long, float, Decimal)):
+        if not isinstance(value, six.integer_types + (float, Decimal)):
             raise TypeError("Expected int, found %r: %r"
                             % (type(value), value))
         return int(value)
@@ -349,7 +355,7 @@
     __slots__ = ()
 
     def parse_set(self, value, from_db):
-        if not isinstance(value, (int, long, float, Decimal)):
+        if not isinstance(value, six.integer_types + (float, Decimal)):
             raise TypeError("Expected float, found %r: %r"
                             % (type(value), value))
         return float(value)
@@ -360,8 +366,8 @@
 
     @staticmethod
     def parse_set(value, from_db):
-        if (from_db and isinstance(value, basestring) or
-            isinstance(value, (int, long))):
+        if (from_db and isinstance(value, six.string_types) or
+            isinstance(value, six.integer_types)):
             value = Decimal(value)
         elif not isinstance(value, Decimal):
             raise TypeError("Expected Decimal, found %r: %r"
@@ -371,7 +377,7 @@
     @staticmethod
     def parse_get(value, to_db):
         if to_db:
-            return unicode(value)
+            return six.text_type(value)
         return value
 
 
@@ -380,9 +386,9 @@
 
     def parse_set(self, value, from_db):
         if isinstance(value, buffer):
-            value = str(value)
-        elif not isinstance(value, str):
-            raise TypeError("Expected str, found %r: %r"
+            value = six.binary_type(value)
+        elif not isinstance(value, six.binary_type):
+            raise TypeError("Expected bytes, found %r: %r"
                             % (type(value), value))
         return value
 
@@ -391,7 +397,7 @@
     __slots__ = ()
 
     def parse_set(self, value, from_db):
-        if not isinstance(value, unicode):
+        if not isinstance(value, six.text_type):
             raise TypeError("Expected unicode, found %r: %r"
                             % (type(value), value))
         return value
@@ -408,7 +414,7 @@
         if from_db:
             if isinstance(value, datetime):
                 pass
-            elif isinstance(value, (str, unicode)):
+            elif isinstance(value, six.string_types):
                 if " " not in value:
                     raise ValueError("Unknown date/time format: %r" % value)
                 date_str, time_str = value.split(" ")
@@ -422,7 +428,7 @@
                 else:
                     value = value.astimezone(self._tzinfo)
         else:
-            if type(value) in (int, long, float):
+            if type(value) in six.integer_types + (float, ):
                 value = datetime.utcfromtimestamp(value)
             elif not isinstance(value, datetime):
                 raise TypeError("Expected datetime, found %s" % repr(value))
@@ -442,7 +448,7 @@
                 return value.date()
             if isinstance(value, date):
                 return value
-            if not isinstance(value, (str, unicode)):
+            if not isinstance(value,  six.string_types):
                 raise TypeError("Expected date, found %s" % repr(value))
             if " " in value:
                 value, time_str = value.split(" ")
@@ -465,7 +471,7 @@
                 return None
             if isinstance(value, time):
                 return value
-            if not isinstance(value, (str, unicode)):
+            if not isinstance(value, six.string_types):
                 raise TypeError("Expected time, found %s" % repr(value))
             if " " in value:
                 date_str, value = value.split(" ")
@@ -488,7 +494,7 @@
                 return None
             if isinstance(value, timedelta):
                 return value
-            if not isinstance(value, (str, unicode)):
+            if not isinstance(value, six.string_types):
                 raise TypeError("Expected timedelta, found %s" % repr(value))
             return _parse_interval(value)
         else:
@@ -502,7 +508,7 @@
 
     def parse_set(self, value, from_db):
         assert uuid is not None, "The uuid module was not found."
-        if from_db and isinstance(value, basestring):
+        if from_db and isinstance(value, six.string_types):
             value = uuid.UUID(value)
         elif not isinstance(value, uuid.UUID):
             raise TypeError("Expected UUID, found %r: %r"
@@ -511,7 +517,7 @@
 
     def parse_get(self, value, to_db):
         if to_db:
-            return unicode(value)
+            return six.text_type(value)
         return value
 
 
@@ -595,7 +601,7 @@
     def parse_set(self, value, from_db):
         if from_db:
             if isinstance(value, buffer):
-                value = str(value)
+                value = six.binary_type(value)
             return self._loads(value)
         else:
             return value
@@ -633,7 +639,7 @@
         super(JSONVariable, self).__init__(*args, **kwargs)
 
     def _loads(self, value):
-        if not isinstance(value, unicode):
+        if not isinstance(value, six.text_type):
             raise TypeError(
                 "Cannot safely assume encoding of byte string %r." % value)
         return json.loads(value)
@@ -643,7 +649,7 @@
         # and so we treat it as such here. In other words, this method returns
         # unicode and never str.
         dump = json.dumps(value, ensure_ascii=False)
-        if not isinstance(dump, unicode):
+        if not isinstance(dump, six.text_type):
             # json.dumps() does not always return unicode. See
             # http://code.google.com/p/simplejson/issues/detail?id=40 for one
             # of many discussions of str/unicode handling in simplejson.

=== modified file 'storm/xid.py'
--- storm/xid.py	2012-03-01 13:28:26 +0000
+++ storm/xid.py	2017-06-09 20:57:05 +0000
@@ -20,6 +20,7 @@
 #
 
 
+from builtins import object
 class Xid(object):
     """
     Represent a transaction identifier compliant with the XA specification.

=== modified file 'storm/zope/schema.py'
--- storm/zope/schema.py	2010-08-17 14:00:59 +0000
+++ storm/zope/schema.py	2017-06-09 20:57:05 +0000
@@ -19,6 +19,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 """ZStorm-aware schema manager."""
+from builtins import object
 import transaction
 
 from storm.schema import Schema

=== modified file 'storm/zope/testing.py'
--- storm/zope/testing.py	2014-12-18 11:37:22 +0000
+++ storm/zope/testing.py	2017-06-09 20:57:05 +0000
@@ -98,7 +98,7 @@
             # compatibility. This should be eventually dropped.
             if isinstance(databases, dict):
                 databases = [{"name": name, "uri": uri, "schema": schema}
-                             for name, (uri, schema) in databases.iteritems()]
+                             for name, (uri, schema) in databases.items()]
 
             # Provide the global IZStorm utility before applying patches, so
             # patch code can get the ztorm object if needed (e.g. looking up

=== modified file 'storm/zope/zstorm.py'
--- storm/zope/zstorm.py	2012-03-28 10:57:43 +0000
+++ storm/zope/zstorm.py	2017-06-09 20:57:05 +0000
@@ -24,6 +24,8 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
+from builtins import str
+from builtins import object
 import threading
 import weakref
 
@@ -209,7 +211,7 @@
         # avoid the problem where a store is deallocated during
         # iteration causing RuntimeError: dictionary changed size
         # during iteration.
-        for store, name in self._name_index.items():
+        for store, name in list(self._name_index.items()):
             yield name, store
 
     def get_name(self, store):

=== modified file 'tests/cache.py'
--- tests/cache.py	2011-07-14 11:15:30 +0000
+++ tests/cache.py	2017-06-09 20:57:05 +0000
@@ -1,3 +1,6 @@
+from builtins import str
+from builtins import range
+from builtins import object
 from unittest import defaultTestLoader
 
 from storm.properties import Int
@@ -134,7 +137,7 @@
         """
         size = 10
         cache = self.Cache(size)
-        for value in xrange(size):
+        for value in range(size):
             cache.add(StubObjectInfo(value))
         self.assertEqual(len(cache.get_cached()), size)
 
@@ -255,7 +258,7 @@
         """
         size = 10
         cache = GenerationalCache(size)
-        for value in xrange(5 * size):
+        for value in range(5 * size):
             cache.add(StubObjectInfo(value))
         self.assertEquals(len(cache.get_cached()), size * 2)
 
@@ -298,7 +301,7 @@
         size = 10
         cache = GenerationalCache(size * 100)
         cache.set_size(size)
-        for value in xrange(size * 10):
+        for value in range(size * 10):
             cache.add(StubObjectInfo(value))
         self.assertEquals(len(cache.get_cached()), size * 2)
 

=== modified file 'tests/database.py'
--- tests/database.py	2013-02-15 17:00:18 +0000
+++ tests/database.py	2017-06-09 20:57:05 +0000
@@ -18,6 +18,9 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
+from builtins import str
+from builtins import range
+from builtins import object
 import sys
 import new
 import gc

=== modified file 'tests/databases/base.py'
--- tests/databases/base.py	2015-06-15 12:06:44 +0000
+++ tests/databases/base.py	2017-06-09 20:57:05 +0000
@@ -20,8 +20,12 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
+from future import standard_library
+standard_library.install_aliases()
+from builtins import next, str, object
+import six
 from datetime import datetime, date, time, timedelta
-import cPickle as pickle
+import pickle as pickle
 import shutil
 import sys
 import os
@@ -149,7 +153,7 @@
         self.assertTrue(isinstance(result, Result))
         row = result.get_one()
         self.assertEquals(row, ("Title 10",))
-        self.assertTrue(isinstance(row[0], unicode))
+        self.assertTrue(isinstance(row[0], six.text_type))
 
     def test_execute_params(self):
         result = self.connection.execute("SELECT one FROM number "
@@ -192,12 +196,12 @@
                                           "ORDER BY id DESC")
         iter1 = iter(result1)
         iter2 = iter(result2)
-        self.assertEquals(iter1.next(), (10, "Title 10"))
-        self.assertEquals(iter2.next(), (20, "Title 20"))
-        self.assertEquals(iter1.next(), (20, "Title 20"))
-        self.assertEquals(iter2.next(), (10, "Title 10"))
-        self.assertRaises(StopIteration, iter1.next)
-        self.assertRaises(StopIteration, iter2.next)
+        self.assertEquals(next(iter1), (10, "Title 10"))
+        self.assertEquals(next(iter2), (20, "Title 20"))
+        self.assertEquals(next(iter1), (20, "Title 20"))
+        self.assertEquals(next(iter2), (10, "Title 10"))
+        self.assertRaises(StopIteration, next, iter1)
+        self.assertRaises(StopIteration, next, iter2)
 
     def test_get_insert_identity(self):
         result = self.connection.execute("INSERT INTO test (title) "
@@ -346,7 +350,7 @@
                 connection2.execute("UPDATE test SET title='Title 100' "
                                     "WHERE id=10")
                 connection2.commit()
-            except OperationalError, e:
+            except OperationalError as e:
                 self.assertEquals(str(e), "database is locked") # SQLite blocks
             result = connection1.execute("SELECT title FROM test WHERE id=10")
             self.assertEquals(result.get_one(), ("Title 10",))
@@ -385,7 +389,7 @@
     def test_wb_result_iter_goes_through_from_database(self):
         result = self.connection.execute("SELECT one, two FROM number")
         result.from_database = self.from_database
-        self.assertEquals(iter(result).next(), (2, 3))
+        self.assertEquals(next(iter(result)), (2, 3))
 
     def test_rowcount_insert(self):
         # All supported backends support rowcount, so far.
@@ -772,7 +776,7 @@
             cursor = self.connection._raw_connection.cursor()
             cursor.execute("SELECT 1")
             cursor.fetchone()
-        except Error, exc:
+        except Error as exc:
             self.assertTrue(self.connection.is_disconnection_error(exc))
         else:
             self.fail("Disconnection was not caught.")
@@ -781,7 +785,7 @@
         # error when called.
         try:
             self.connection._raw_connection.rollback()
-        except Error, exc:
+        except Error as exc:
             self.assertTrue(self.connection.is_disconnection_error(exc))
         else:
             self.fail("Disconnection was not raised.")
@@ -805,7 +809,7 @@
             cursor = self.connection._raw_connection.cursor()
             cursor.execute("SELECT 1")
             cursor.fetchone()
-        except DatabaseError, exc:
+        except DatabaseError as exc:
             self.assertTrue(self.connection.is_disconnection_error(exc))
         else:
             self.fail("Disconnection was not caught.")

=== modified file 'tests/databases/postgres.py'
--- tests/databases/postgres.py	2016-04-29 08:38:51 +0000
+++ tests/databases/postgres.py	2017-06-09 20:57:05 +0000
@@ -18,6 +18,8 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
+from builtins import object
+import six
 from datetime import date, time, timedelta
 import os
 import json
@@ -154,7 +156,7 @@
         result = connection.execute("SELECT title FROM test WHERE id=1")
         title = result.get_one()[0]
 
-        self.assertTrue(isinstance(title, unicode))
+        self.assertTrue(isinstance(title, six.text_type))
         self.assertEquals(title, uni_str)
 
     def test_unicode_array(self):
@@ -735,13 +737,13 @@
         InterfaceErrors are a form of a disconnection error, so rollback()
         must swallow them and reconnect.
         """
-        class FakeConnection:
+        class FakeConnection(object):
             def rollback(self):
                 raise InterfaceError('connection already closed')
         self.connection._raw_connection = FakeConnection()
         try:
             self.connection.rollback()
-        except Exception, exc:
+        except Exception as exc:
             self.fail('Exception should have been swallowed: %s' % repr(exc))
 
 
@@ -875,7 +877,7 @@
         self.remaining_time = 0.001
         try:
             self.connection.execute(statement)
-        except TimeoutError, e:
+        except TimeoutError as e:
             self.assertEqual("SQL server cancelled statement", e.message)
             self.assertEqual(statement, e.statement)
             self.assertEqual((), e.params)

=== modified file 'tests/databases/proxy.py'
--- tests/databases/proxy.py	2007-10-24 06:27:06 +0000
+++ tests/databases/proxy.py	2017-06-09 20:57:05 +0000
@@ -20,22 +20,24 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
+from future import standard_library
+standard_library.install_aliases()
 import os
 import select
 import socket
-import SocketServer
+import socketserver
 import threading
 
 
 TIMEOUT = 0.1
 
 
-class ProxyRequestHandler(SocketServer.BaseRequestHandler):
+class ProxyRequestHandler(socketserver.BaseRequestHandler):
     """A request handler that proxies traffic to another TCP port."""
 
     def __init__(self, request, client_address, server):
         self._generation = server._generation
-        SocketServer.BaseRequestHandler.__init__(
+        socketserver.BaseRequestHandler.__init__(
             self, request, client_address, server)
 
     def handle(self):
@@ -66,12 +68,12 @@
                     self.request.shutdown(socket.SHUT_WR)
 
 
-class ProxyTCPServer(SocketServer.ThreadingTCPServer):
+class ProxyTCPServer(socketserver.ThreadingTCPServer):
 
     allow_reuse_address = True
 
     def __init__(self, proxy_dest):
-        SocketServer.ThreadingTCPServer.__init__(
+        socketserver.ThreadingTCPServer.__init__(
             self, ("127.0.0.1", 0), ProxyRequestHandler)
         # Python 2.4 doesn't retrieve the socket details, so record
         # them here.  We need to do this so we can recreate the socket

=== modified file 'tests/databases/sqlite.py'
--- tests/databases/sqlite.py	2013-05-05 10:36:13 +0000
+++ tests/databases/sqlite.py	2017-06-09 20:57:05 +0000
@@ -18,6 +18,7 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
+from builtins import str
 from datetime import timedelta
 import time
 import os
@@ -114,7 +115,7 @@
         started = time.time()
         try:
             connection2.execute("INSERT INTO test VALUES (2)")
-        except OperationalError, exception:
+        except OperationalError as exception:
             self.assertEquals(str(exception), "database is locked")
             self.assertTrue(time.time()-started >= 0.3)
         else:
@@ -141,7 +142,7 @@
         started = time.time()
         try:
             connection1.commit()
-        except OperationalError, exception:
+        except OperationalError as exception:
             self.assertEquals(str(exception), "database is locked")
             # In 0.10, the next assertion failed because the timeout wasn't
             # enforced for the "COMMIT" statement.

=== modified file 'tests/event.py'
--- tests/event.py	2008-06-18 15:27:03 +0000
+++ tests/event.py	2017-06-09 20:57:05 +0000
@@ -18,6 +18,7 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
+from builtins import object
 from storm.event import EventSystem
 
 from tests.helper import TestHelper

=== modified file 'tests/expr.py'
--- tests/expr.py	2012-03-26 14:27:29 +0000
+++ tests/expr.py	2017-06-09 20:57:05 +0000
@@ -1,3 +1,4 @@
+from __future__ import division
 #
 # Copyright (c) 2006, 2007 Canonical
 #
@@ -18,6 +19,8 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
+from builtins import range
+from builtins import object
 from decimal import Decimal
 
 from tests.helper import TestHelper
@@ -35,9 +38,9 @@
 # Create columnN, tableN, and elemN variables.
 for i in range(10):
     for name in ["column", "elem"]:
-        exec "%s%d = SQLToken('%s%d')" % (name, i, name, i)
+        exec("%s%d = SQLToken('%s%d')" % (name, i, name, i))
     for name in ["table"]:
-        exec "%s%d = '%s %d'" % (name, i, name, i)
+        exec("%s%d = '%s %d'" % (name, i, name, i))
 
 
 class TrackContext(FromExpr):
@@ -495,7 +498,7 @@
 
     def test_precedence(self):
         for i in range(10):
-            exec "e%d = SQLRaw('%d')" % (i, i)
+            exec("e%d = SQLRaw('%d')" % (i, i))
         expr = And(e1, Or(e2, e3),
                    Add(e4, Mul(e5, Sub(e6, Div(e7, Div(e8, e9))))))
         statement = compile(expr)
@@ -586,7 +589,7 @@
 
     def test_long(self):
         state = State()
-        statement = compile(1L, state)
+        statement = compile(1, state)
         self.assertEquals(statement, "?")
         self.assertVariablesEqual(state.parameters, [IntVariable(1)])
 
@@ -1360,7 +1363,7 @@
         self.assertEquals(statement, "elem1/elem2/elem3")
         self.assertEquals(state.parameters, [])
 
-        expr = Func1() / "value"
+        expr = Func1() // "value"
         state = State()
         statement = compile(expr, state)
         self.assertEquals(statement, "func1()/?")
@@ -2130,7 +2133,7 @@
 
     def test_precedence(self):
         for i in range(10):
-            exec "e%d = SQLRaw('%d')" % (i, i)
+            exec("e%d = SQLRaw('%d')" % (i, i))
         expr = And(e1, Or(e2, e3),
                    Add(e4, Mul(e5, Sub(e6, Div(e7, Div(e8, e9))))))
         py_expr = compile_python(expr)
@@ -2172,7 +2175,7 @@
         self.assertEquals(py_expr, "1")
 
     def test_long(self):
-        py_expr = compile_python(1L)
+        py_expr = compile_python(1)
         self.assertEquals(py_expr, "1L")
 
     def test_bool(self):

=== modified file 'tests/helper.py'
--- tests/helper.py	2012-04-04 23:42:51 +0000
+++ tests/helper.py	2017-06-09 20:57:05 +0000
@@ -18,7 +18,11 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-from cStringIO import StringIO
+from future import standard_library
+standard_library.install_aliases()
+from builtins import zip
+from builtins import object
+from io import StringIO
 import tempfile
 import logging
 import shutil

=== modified file 'tests/info.py'
--- tests/info.py	2011-12-07 11:57:07 +0000
+++ tests/info.py	2017-06-09 20:57:05 +0000
@@ -18,6 +18,8 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
+from builtins import zip
+from builtins import object
 from weakref import ref
 import gc
 
@@ -28,6 +30,7 @@
 from storm.info import *
 
 from tests.helper import TestHelper
+from future.utils import with_metaclass
 
 
 class Wrapper(object):
@@ -569,8 +572,7 @@
                 cls = type.__new__(meta_cls, name, bases, dict)
                 cls.__storm_table__ = "HAH! GOTCH YA!"
                 return cls
-        class Class(object):
-            __metaclass__ = MetaClass
+        class Class(with_metaclass(MetaClass, object)):
             __storm_table__ = "table"
             prop1 = Property("column1", primary=True)
         Alias = ClassAlias(Class, "USE_THIS")

=== modified file 'tests/mocker.py'
--- tests/mocker.py	2008-05-18 10:22:29 +0000
+++ tests/mocker.py	2017-06-09 20:57:05 +0000
@@ -3,7 +3,13 @@
 
 Graceful platform for test doubles in Python (mocks, stubs, fakes, and dummies).
 """
-import __builtin__
+from future import standard_library
+standard_library.install_aliases()
+from builtins import zip
+from builtins import str
+from builtins import range
+from builtins import object
+import builtins
 import tempfile
 import unittest
 import inspect
@@ -13,6 +19,8 @@
 import os
 import gc
 
+import six
+
 
 if sys.version_info < (2, 4):
     from sets import Set as set # pragma: nocover
@@ -274,7 +282,7 @@
         """
         first_methods = dict(inspect.getmembers(first, inspect.ismethod))
         second_methods = dict(inspect.getmembers(second, inspect.ismethod))
-        for name, first_method in first_methods.items():
+        for name, first_method in list(first_methods.items()):
             first_argspec = inspect.getargspec(first_method)
             first_formatted = inspect.formatargspec(*first_argspec)
 
@@ -487,7 +495,7 @@
         for event in self._events:
             try:
                 event.verify()
-            except AssertionError, e:
+            except AssertionError as e:
                 error = str(e)
                 if not error:
                     raise RuntimeError("Empty error message from %r"
@@ -562,7 +570,7 @@
                             explicitly requested via the L{passthrough()}
                             method.
         """
-        if isinstance(object, basestring):
+        if isinstance(object, six.string_types):
             if name is None:
                 name = object
             import_stack = object.split(".")
@@ -583,7 +591,7 @@
         if spec is True:
             spec = object
         if type is True:
-            type = __builtin__.type(object)
+            type = builtins.type(object)
         return Mock(self, spec=spec, type=type, object=object,
                     name=name, count=count, passthrough=passthrough)
 
@@ -1029,7 +1037,7 @@
             path.root_object = object
         try:
             return self.__mocker__.act(path)
-        except MatchError, exception:
+        except MatchError as exception:
             root_mock = path.root_mock
             if (path.root_object is not None and
                 root_mock.__mocker_passthrough__):
@@ -1037,7 +1045,7 @@
             # Reinstantiate to show raise statement on traceback, and
             # also to make the traceback shown shorter.
             raise MatchError(str(exception))
-        except AssertionError, e:
+        except AssertionError as e:
             lines = str(e).splitlines()
             message = [ERROR_PREFIX + "Unmet expectation:", ""]
             message.append("=> " + lines.pop(0))
@@ -1083,16 +1091,16 @@
         # something that doesn't offer them.
         try:
             result = self.__mocker_act__("len")
-        except MatchError, e:
+        except MatchError as e:
             raise AttributeError(str(e))
         if type(result) is Mock:
             return 0
         return result
 
-    def __nonzero__(self):
+    def __bool__(self):
         try:
             return self.__mocker_act__("nonzero")
-        except MatchError, e:
+        except MatchError as e:
             return True
 
     def __iter__(self):
@@ -1115,13 +1123,13 @@
         frame = sys._getframe(depth+1)
     except:
         return None
-    for name, frame_obj in frame.f_locals.iteritems():
+    for name, frame_obj in frame.f_locals.items():
         if frame_obj is obj:
             return name
     self = frame.f_locals.get("self")
     if self is not None:
         try:
-            items = list(self.__dict__.iteritems())
+            items = list(self.__dict__.items())
         except:
             pass
         else:
@@ -1270,7 +1278,7 @@
                 result = "del %s.%s" % (result, action.args[0])
             elif action.kind == "call":
                 args = [repr(x) for x in action.args]
-                items = list(action.kwargs.iteritems())
+                items = list(action.kwargs.items())
                 items.sort()
                 for pair in items:
                     args.append("%s=%r" % pair)
@@ -1390,7 +1398,7 @@
 
     # Either we have the same number of kwargs, or unknown keywords are
     # accepted (KWARGS was used), so check just the ones in kwargs1.
-    for key, arg1 in kwargs1.iteritems():
+    for key, arg1 in kwargs1.items():
         if key not in kwargs2:
             return False
         arg2 = kwargs2[key]
@@ -1519,7 +1527,7 @@
         for task in self._tasks:
             try:
                 task_result = task.run(path)
-            except AssertionError, e:
+            except AssertionError as e:
                 error = str(e)
                 if not error:
                     raise RuntimeError("Empty error message from %r" % task)
@@ -1562,7 +1570,7 @@
         for task in self._tasks:
             try:
                 task.verify()
-            except AssertionError, e:
+            except AssertionError as e:
                 error = str(e)
                 if not error:
                     raise RuntimeError("Empty error message from %r" % task)
@@ -1672,7 +1680,7 @@
     def __init__(self, min, max=False):
         self.min = min
         if max is None:
-            self.max = sys.maxint
+            self.max = sys.maxsize
         elif max is False:
             self.max = min
         else:
@@ -1920,7 +1928,7 @@
     for referrer in gc.get_referrers(remove):
         if (type(referrer) is dict and
             referrer.get("__mocker_replace__", True)):
-            for key, value in referrer.items():
+            for key, value in list(referrer.items()):
                 if value is remove:
                     referrer[key] = install
 
@@ -1992,7 +2000,7 @@
         for kind in self._monitored:
             attr = self._get_kind_attr(kind)
             seen = set()
-            for obj in self._monitored[kind].itervalues():
+            for obj in self._monitored[kind].values():
                 cls = type(obj)
                 if issubclass(cls, type):
                     cls = obj
@@ -2006,7 +2014,7 @@
                                     self.execute)
 
     def restore(self):
-        for obj, attr, original in self._patched.itervalues():
+        for obj, attr, original in self._patched.values():
             if original is Undefined:
                 delattr(obj, attr)
             else:

=== modified file 'tests/properties.py'
--- tests/properties.py	2011-09-07 14:04:04 +0000
+++ tests/properties.py	2017-06-09 20:57:05 +0000
@@ -18,9 +18,11 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
+from builtins import object
 from datetime import datetime, date, time, timedelta
 from decimal import Decimal as decimal
 import gc
+from future.utils import with_metaclass
 try:
     import uuid
 except ImportError:
@@ -991,8 +993,8 @@
     def setUp(self):
         TestHelper.setUp(self)
 
-        class Base(object):
-            __metaclass__ = PropertyPublisherMeta
+        class Base(with_metaclass(PropertyPublisherMeta, object)):
+            pass
 
         class Class(Base):
             __storm_table__ = "mytable"

=== modified file 'tests/schema/patch.py'
--- tests/schema/patch.py	2014-12-18 10:57:52 +0000
+++ tests/schema/patch.py	2017-06-09 20:57:05 +0000
@@ -18,6 +18,8 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
+from builtins import str
+from builtins import object
 import traceback
 import sys
 import os
@@ -345,7 +347,7 @@
         self.add_module("patch_999.py", patch_no_args_apply)
         try:
             self.patch_applier.apply_all()
-        except BadPatchError, e:
+        except BadPatchError as e:
             self.assertTrue("mypackage/patch_999.py" in str(e))
             self.assertTrue("takes no arguments" in str(e))
             self.assertTrue("TypeError" in str(e))
@@ -360,7 +362,7 @@
         self.add_module("patch_999.py", patch_missing_apply)
         try:
             self.patch_applier.apply_all()
-        except BadPatchError, e:
+        except BadPatchError as e:
             self.assertTrue("mypackage/patch_999.py" in str(e))
             self.assertTrue("no attribute" in str(e))
             self.assertTrue("AttributeError" in str(e))
@@ -375,7 +377,7 @@
         self.add_module("patch_999.py", "that's not python")
         try:
             self.patch_applier.apply_all()
-        except BadPatchError, e:
+        except BadPatchError as e:
             self.assertTrue(" 999 " in str(e))
             self.assertTrue("SyntaxError" in str(e))
         else:
@@ -389,7 +391,7 @@
         self.add_module("patch_999.py", patch_name_error)
         try:
             self.patch_applier.apply_all()
-        except BadPatchError, e:
+        except BadPatchError as e:
             self.assertTrue("mypackage/patch_999.py" in str(e))
             self.assertTrue("NameError" in str(e))
             self.assertTrue("blah" in str(e))

=== modified file 'tests/schema/schema.py'
--- tests/schema/schema.py	2015-01-26 09:57:25 +0000
+++ tests/schema/schema.py	2017-06-09 20:57:05 +0000
@@ -18,6 +18,7 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
+from builtins import object
 import os
 import sys
 
@@ -65,9 +66,7 @@
         for name in list(sys.modules):
             if name in self._package_names:
                 del sys.modules[name]
-            elif filter(
-                None,
-                [name.startswith("%s." % x) for x in self._package_names]):
+            elif [_f for _f in [name.startswith("%s." % x) for x in self._package_names] if _f]:
                 del sys.modules[name]
 
         super(SchemaTest, self).tearDown()

=== modified file 'tests/schema/sharding.py'
--- tests/schema/sharding.py	2014-12-18 11:37:22 +0000
+++ tests/schema/sharding.py	2017-06-09 20:57:05 +0000
@@ -18,6 +18,8 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
+from builtins import range
+from builtins import object
 from tests.mocker import MockerTestCase
 
 from storm.schema.schema import SchemaMissingError, UnappliedPatchesError
@@ -35,7 +37,7 @@
         if store.pristine:
             raise SchemaMissingError()
         if store.patch < self.patches:
-            unapplied_versions = range(store.patch + 1, self.patches + 1)
+            unapplied_versions = list(range(store.patch + 1, self.patches + 1))
             raise UnappliedPatchesError(unapplied_versions)
 
     def create(self, store):

=== modified file 'tests/sqlobject.py'
--- tests/sqlobject.py	2016-03-01 11:44:05 +0000
+++ tests/sqlobject.py	2017-06-09 20:57:05 +0000
@@ -18,6 +18,7 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
+import six
 import datetime
 import operator
 
@@ -121,7 +122,7 @@
             _defaultOrder = "-Person.name"
             _table = "person"
             _idName = "name"
-            _idType = unicode
+            _idType = six.text_type
             age = IntCol()
             ts = UtcDateTimeCol()
 
@@ -1183,7 +1184,7 @@
         # properties:
         class Person(self.SQLObject):
             _idName = "name"
-            _idType = unicode
+            _idType = six.text_type
             address = ForeignKey(foreignKey="Phone", dbName="address_id",
                                  notNull=True)
 

=== modified file 'tests/store/base.py'
--- tests/store/base.py	2016-05-13 18:55:24 +0000
+++ tests/store/base.py	2017-06-09 20:57:05 +0000
@@ -20,7 +20,11 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-from cStringIO import StringIO
+from future import standard_library
+standard_library.install_aliases()
+from builtins import range, object
+import six
+from io import StringIO
 import decimal
 import gc
 import operator
@@ -47,6 +51,7 @@
 
 from tests.info import Wrapper
 from tests.helper import TestHelper
+from future.utils import with_metaclass
 
 
 class Foo(object):
@@ -1021,7 +1026,7 @@
     def test_find_max_unicode(self):
         title = self.store.find(Foo).max(Foo.title)
         self.assertEquals(title, "Title 30")
-        self.assertTrue(isinstance(title, unicode))
+        self.assertTrue(isinstance(title, six.text_type))
 
     def test_find_max_with_empty_result_and_disallow_none(self):
         class Bar(object):
@@ -1042,7 +1047,7 @@
     def test_find_min_unicode(self):
         title = self.store.find(Foo).min(Foo.title)
         self.assertEquals(title, "Title 10")
-        self.assertTrue(isinstance(title, unicode))
+        self.assertTrue(isinstance(title, six.text_type))
 
     def test_find_min_with_empty_result_and_disallow_none(self):
         class Bar(object):
@@ -1126,7 +1131,7 @@
         values = list(values)
         self.assertEquals(values, ["Title 30", "Title 20", "Title 10"])
         self.assertEquals([type(value) for value in values],
-                          [unicode, unicode, unicode])
+                          [six.text_type, six.text_type, six.text_type])
 
     def test_find_multiple_values(self):
         result = self.store.find(Foo).order_by(Foo.id)
@@ -1138,7 +1143,7 @@
 
     def test_find_values_with_no_arguments(self):
         result = self.store.find(Foo).order_by(Foo.id)
-        self.assertRaises(FeatureError, result.values().next)
+        self.assertRaises(FeatureError, next, result.values())
 
     def test_find_slice_values(self):
         values = self.store.find(Foo).order_by(Foo.id)[1:2].values(Foo.id)
@@ -1552,7 +1557,7 @@
         result.group_by(FooValue.value2)
         result.order_by(Count(FooValue.id), Sum(FooValue.value1))
         result = list(result)
-        self.assertEquals(result, [(2L, 2L), (2L, 2L), (2L, 3L), (3L, 6L)])
+        self.assertEquals(result, [(2, 2), (2, 2), (2, 3), (3, 6)])
 
     def test_find_group_by_table(self):
         result = self.store.find(
@@ -2534,7 +2539,7 @@
         foo = self.store.get(Foo, 20)
         self.store.execute("UPDATE foo SET title='Title 40' WHERE id=20")
         self.store.reload(foo)
-        for variable in get_obj_info(foo).variables.values():
+        for variable in list(get_obj_info(foo).variables.values()):
             self.assertFalse(variable.has_changed())
 
     def test_reload_new(self):
@@ -4426,8 +4431,8 @@
         self.assertRaises(NoStoreError, foo2.bars.remove, object())
 
     def test_string_reference(self):
-        class Base(object):
-            __metaclass__ = PropertyPublisherMeta
+        class Base(with_metaclass(PropertyPublisherMeta, object)):
+            pass
 
         class MyBar(Base):
             __storm_table__ = "bar"
@@ -4453,8 +4458,8 @@
         metaclass.  This makes it possible to work around problems with
         circular dependencies by delaying property resolution.
         """
-        class Base(object):
-            __metaclass__ = PropertyPublisherMeta
+        class Base(with_metaclass(PropertyPublisherMeta, object)):
+            pass
 
         class MyFoo(Base):
             __storm_table__ = "foo"
@@ -4493,8 +4498,8 @@
         metaclass.  This makes it possible to work around problems with
         circular dependencies by delaying resolution of the order by column.
         """
-        class Base(object):
-            __metaclass__ = PropertyPublisherMeta
+        class Base(with_metaclass(PropertyPublisherMeta, object)):
+            pass
 
         class MyFoo(Base):
             __storm_table__ = "foo"
@@ -4918,7 +4923,7 @@
         foo = self.store.get(DictFoo, 20)
         foo["a"] = 1
 
-        self.assertEquals(foo.items(), [("a", 1)])
+        self.assertEquals(list(foo.items()), [("a", 1)])
 
         new_obj = DictFoo()
         new_obj.id = 40
@@ -5252,7 +5257,7 @@
         self.store.add(foo)
         foo.id = AutoReload
         foo.title = u"New Title"
-        self.assertTrue(isinstance(foo.id, (int, long)))
+        self.assertTrue(isinstance(foo.id, six.integer_types))
         self.assertEquals(foo.title, "New Title")
 
     def test_autoreload_primary_key_doesnt_reload_everything_else(self):
@@ -5762,8 +5767,8 @@
         self.assertEquals(foo.title, "New Title")
 
     def get_bar_proxy_with_string(self):
-        class Base(object):
-            __metaclass__ = PropertyPublisherMeta
+        class Base(with_metaclass(PropertyPublisherMeta, object)):
+            pass
 
         class MyBarProxy(Base):
             __storm_table__ = "bar"
@@ -5930,8 +5935,8 @@
             self.store.commit()
             try:
                 self.assertEquals(myfoo.title, title)
-            except AssertionError, e:
-                raise AssertionError(unicode(e, 'replace') +
+            except AssertionError as e:
+                raise AssertionError(six.text_type(e, 'replace') +
                     " (ensure your database was created with CREATE DATABASE"
                     " ... CHARACTER SET utf8)")
 
@@ -6224,8 +6229,8 @@
         self.assertEquals(list(result), [])
 
     def test_values_no_columns(self):
-        self.assertRaises(FeatureError, list, self.result.values())
-        self.assertRaises(FeatureError, list, self.empty.values())
+        self.assertRaises(FeatureError, list, list(self.result.values()))
+        self.assertRaises(FeatureError, list, list(self.empty.values()))
 
     def test_values(self):
         self.assertEquals(list(self.result.values(Foo.title)), [])

=== modified file 'tests/store/postgres.py'
--- tests/store/postgres.py	2012-03-08 13:46:23 +0000
+++ tests/store/postgres.py	2017-06-09 20:57:05 +0000
@@ -18,6 +18,7 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
+from builtins import object
 import os
 import gc
 

=== modified file 'tests/tracer.py'
--- tests/tracer.py	2012-06-28 14:21:49 +0000
+++ tests/tracer.py	2017-06-09 20:57:05 +0000
@@ -1,3 +1,5 @@
+from builtins import str
+from builtins import object
 import datetime
 import os
 import sys
@@ -290,7 +292,7 @@
 
         try:
             self.execute()
-        except TimeoutError, e:
+        except TimeoutError as e:
             self.assertEqual("0 seconds remaining in time budget", e.message)
             self.assertEqual(self.statement, e.statement)
             self.assertEqual(self.params, e.params)
@@ -662,7 +664,7 @@
         try:
             with CaptureTracer():
                 raise RuntimeError("boom")
-        except RuntimeError, error:
+        except RuntimeError as error:
             errors.append(error)
         [error] = errors
         self.assertEqual("boom", str(error))

=== modified file 'tests/uri.py'
--- tests/uri.py	2008-01-30 13:03:27 +0000
+++ tests/uri.py	2017-06-09 20:57:05 +0000
@@ -18,6 +18,7 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
+from builtins import str
 from storm.uri import URI, URIError
 
 from tests.helper import TestHelper

=== modified file 'tests/variables.py'
--- tests/variables.py	2011-09-13 22:48:50 +0000
+++ tests/variables.py	2017-06-09 20:57:05 +0000
@@ -18,9 +18,13 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
+from future import standard_library
+standard_library.install_aliases()
+from builtins import str, object
+import six
 from datetime import datetime, date, time, timedelta
 from decimal import Decimal
-import cPickle as pickle
+import pickle as pickle
 import gc
 import weakref
 try:
@@ -143,7 +147,7 @@
         variable = CustomVariable(allow_none=False, column=column)
         try:
             variable.set(None)
-        except NoneError, e:
+        except NoneError as e:
             pass
         self.assertTrue("column_name" in str(e))
 
@@ -152,7 +156,7 @@
         variable = CustomVariable(allow_none=False, column=column)
         try:
             variable.set(None)
-        except NoneError, e:
+        except NoneError as e:
             pass
         self.assertTrue("table_name.column_name" in str(e))
 
@@ -467,7 +471,7 @@
         self.assertEquals(variable.get(), epoch)
         variable.set(0.0)
         self.assertEquals(variable.get(), epoch)
-        variable.set(0L)
+        variable.set(0)
         self.assertEquals(variable.get(), epoch)
         variable.set(epoch)
         self.assertEquals(variable.get(), epoch)
@@ -475,7 +479,7 @@
 
     def test_get_set_from_database(self):
         datetime_str = "1977-05-04 12:34:56.78"
-        datetime_uni = unicode(datetime_str)
+        datetime_uni = six.text_type(datetime_str)
         datetime_obj = datetime(1977, 5, 4, 12, 34, 56, 780000)
 
         variable = DateTimeVariable()
@@ -488,7 +492,7 @@
         self.assertEquals(variable.get(), datetime_obj)
 
         datetime_str = "1977-05-04 12:34:56"
-        datetime_uni = unicode(datetime_str)
+        datetime_uni = six.text_type(datetime_str)
         datetime_obj = datetime(1977, 5, 4, 12, 34, 56)
 
         variable.set(datetime_str, from_db=True)
@@ -553,7 +557,7 @@
 
     def test_get_set_from_database(self):
         date_str = "1977-05-04"
-        date_uni = unicode(date_str)
+        date_uni = six.text_type(date_str)
         date_obj = date(1977, 5, 4)
         datetime_obj = datetime(1977, 5, 4, 0, 0, 0)
 
@@ -597,7 +601,7 @@
 
     def test_get_set_from_database(self):
         time_str = "12:34:56.78"
-        time_uni = unicode(time_str)
+        time_uni = six.text_type(time_str)
         time_obj = time(12, 34, 56, 780000)
 
         variable = TimeVariable()
@@ -610,7 +614,7 @@
         self.assertEquals(variable.get(), time_obj)
 
         time_str = "12:34:56"
-        time_uni = unicode(time_str)
+        time_uni = six.text_type(time_str)
         time_obj = time(12, 34, 56)
 
         variable.set(time_str, from_db=True)
@@ -667,7 +671,7 @@
 
     def test_get_set_from_database(self):
         delta_str = "42 days 12:34:56.78"
-        delta_uni = unicode(delta_str)
+        delta_uni = six.text_type(delta_str)
         delta_obj = timedelta(days=42, hours=12, minutes=34,
                               seconds=56, microseconds=780000)
 
@@ -681,7 +685,7 @@
         self.assertEquals(variable.get(), delta_obj)
 
         delta_str = "1 day, 12:34:56"
-        delta_uni = unicode(delta_str)
+        delta_uni = six.text_type(delta_str)
         delta_obj = timedelta(days=1, hours=12, minutes=34, seconds=56)
 
         variable.set(delta_str, from_db=True)
@@ -769,7 +773,7 @@
     def test_unsupported_unit(self):
         try:
             self.check("1 month", None)
-        except ValueError, e:
+        except ValueError as e:
             self.assertEquals(str(e), "Unsupported interval unit 'month' "
                                       "in interval '1 month'")
         else:
@@ -778,7 +782,7 @@
     def test_missing_value(self):
         try:
             self.check("day", None)
-        except ValueError, e:
+        except ValueError as e:
             self.assertEquals(str(e), "Expected an interval value rather than "
                                       "'day' in interval 'day'")
         else:
@@ -916,7 +920,7 @@
         # simplejson/json.
         variable = self.variable_type()
         variable.set({u"a": 1})
-        self.assertTrue(isinstance(variable.get(to_db=True), unicode))
+        self.assertTrue(isinstance(variable.get(to_db=True), six.text_type))
 
 
 class ListVariableTest(TestHelper):

=== modified file 'tests/wsgi.py'
--- tests/wsgi.py	2012-06-04 14:14:50 +0000
+++ tests/wsgi.py	2017-06-09 20:57:05 +0000
@@ -1,4 +1,7 @@
-import Queue
+from future import standard_library
+standard_library.install_aliases()
+from builtins import object
+import queue
 from unittest import TestCase
 import threading
 import time
@@ -65,7 +68,7 @@
         # with two threads in a request at once, each only sees their own
         # timeline.
         app, find_timeline = make_app(self.stub_app)
-        errors = Queue.Queue()
+        errors = queue.Queue()
         sync = threading.Condition()
         waiting = []
         def check_timeline():

=== modified file 'tests/zope/adapters.py'
--- tests/zope/adapters.py	2009-03-05 21:53:12 +0000
+++ tests/zope/adapters.py	2017-06-09 20:57:05 +0000
@@ -18,6 +18,7 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
+from builtins import object
 from tests.helper import TestHelper
 from tests.zope import has_zope_component
 

=== modified file 'tests/zope/testing.py'
--- tests/zope/testing.py	2015-05-11 08:47:32 +0000
+++ tests/zope/testing.py	2017-06-09 20:57:05 +0000
@@ -18,6 +18,7 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
+from builtins import object
 import os
 import sys
 
@@ -237,7 +238,7 @@
         real_invalidate = store.invalidate
 
         def invalidate_proxy():
-            self.assertEqual(0, len(store._alive.values()))
+            self.assertEqual(0, len(list(store._alive.values())))
             real_invalidate()
         store.invalidate = invalidate_proxy
 

=== modified file 'tests/zope/zstorm.py'
--- tests/zope/zstorm.py	2012-03-06 10:28:06 +0000
+++ tests/zope/zstorm.py	2017-06-09 20:57:05 +0000
@@ -18,6 +18,9 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
+from future import standard_library
+standard_library.install_aliases()
+from builtins import range
 import threading
 import weakref
 import gc
@@ -355,7 +358,7 @@
                     store.execute("SELECT 1")
                 except ZStormError:
                     failures.append("ZStormError raised")
-                except Exception, exc:
+                except Exception as exc:
                     failures.append("Expected ZStormError, got %r" % exc)
                 else:
                     failures.append("Expected ZStormError, nothing raised")