Merge lp:~cjwatson/storm/py3-print into lp:storm

[Colin Watson]

Use Python 3-style print functions.

I added "from __future__ import print_function" to all non-trivial .py files in the hope of ensuring that none creep back in before the port is finished.

[Simon Poirier (simpoir)]

+1 LGTM

review: Approve

=== modified file 'NEWS'
--- NEWS	2019-06-03 08:45:24 +0000
+++ NEWS	2019-06-05 11:42:41 +0000
@@ -35,7 +35,7 @@
     with CaptureTracer() as tracer:
       # Run queries
       pass
-    print tracer.queries  # Print all queries run in the context manager block
+    print(tracer.queries)  # Print all queries run in the context manager block
 
   You will need the python-fixtures package in order to use this feature.
 

=== modified file 'setup.py'
--- setup.py	2019-06-05 10:41:32 +0000
+++ setup.py	2019-06-05 11:42:41 +0000
@@ -1,4 +1,7 @@
 #!/usr/bin/env python
+
+from __future__ import print_function
+
 import os
 import re
 

=== modified file 'storm/__init__.py'
--- storm/__init__.py	2019-05-30 13:39:54 +0000
+++ storm/__init__.py	2019-06-05 11:42:41 +0000
@@ -19,6 +19,8 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
+from __future__ import print_function
+
 import os
 
 

=== modified file 'storm/base.py'
--- storm/base.py	2007-07-05 20:29:25 +0000
+++ storm/base.py	2019-06-05 11:42:41 +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 __future__ import print_function
+
 from storm.properties import PropertyPublisherMeta
 
 

=== modified file 'storm/cache.py'
--- storm/cache.py	2009-02-16 10:44:31 +0000
+++ storm/cache.py	2019-06-05 11:42:41 +0000
@@ -1,3 +1,5 @@
+from __future__ import print_function
+
 import itertools
 
 

=== modified file 'storm/compat.py'
--- storm/compat.py	2019-06-03 08:45:24 +0000
+++ storm/compat.py	2019-06-05 11:42:41 +0000
@@ -19,6 +19,8 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
+from __future__ import print_function
+
 __all__ = ["json"]
 
 

=== modified file 'storm/database.py'
--- storm/database.py	2019-05-30 13:39:54 +0000
+++ storm/database.py	2019-06-05 11:42:41 +0000
@@ -25,6 +25,8 @@
 supported in modules in L{storm.databases}.
 """
 
+from __future__ import print_function
+
 from storm.expr import Expr, State, compile
 # Circular import: imported at the end of the module.
 # from storm.tracer import trace

=== modified file 'storm/databases/__init__.py'
--- storm/databases/__init__.py	2007-08-07 18:36:04 +0000
+++ storm/databases/__init__.py	2019-06-05 11:42:41 +0000
@@ -19,6 +19,8 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
+from __future__ import print_function
+
 
 class Dummy(object):
     """Magic "infectious" class.

=== modified file 'storm/databases/postgres.py'
--- storm/databases/postgres.py	2019-06-05 09:56:39 +0000
+++ storm/databases/postgres.py	2019-06-05 11:42:41 +0000
@@ -19,6 +19,8 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
+from __future__ import print_function
+
 from datetime import datetime, date, time, timedelta
 import json
 

=== modified file 'storm/databases/sqlite.py'
--- storm/databases/sqlite.py	2019-05-30 13:39:54 +0000
+++ storm/databases/sqlite.py	2019-06-05 11:42:41 +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 __future__ import print_function
+
 from datetime import datetime, date, time, timedelta
 from time import sleep, time as now
 import sys

=== modified file 'storm/event.py'
--- storm/event.py	2008-06-18 21:51:12 +0000
+++ storm/event.py	2019-06-05 11:42:41 +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 __future__ import print_function
+
 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	2019-06-05 11:42:41 +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 __future__ import print_function
+
 from abc import ABCMeta
 import types
 

=== modified file 'storm/expr.py'
--- storm/expr.py	2019-06-05 10:41:32 +0000
+++ storm/expr.py	2019-06-05 11:42:41 +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 __future__ import print_function
+
 from decimal import Decimal
 from datetime import datetime, date, time, timedelta
 from weakref import WeakKeyDictionary

=== modified file 'storm/info.py'
--- storm/info.py	2011-08-14 08:55:15 +0000
+++ storm/info.py	2019-06-05 11:42:41 +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 __future__ import print_function
+
 from weakref import ref
 
 from storm.exceptions import ClassInfoError

=== modified file 'storm/locals.py'
--- storm/locals.py	2012-03-01 13:28:26 +0000
+++ storm/locals.py	2019-06-05 11:42:41 +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 __future__ import print_function
+
 from storm.properties import Bool, Int, Float, RawStr, Chars, Unicode
 from storm.properties import List, Decimal, DateTime, Date, Time, Enum, UUID
 from storm.properties import TimeDelta, Pickle, JSON

=== modified file 'storm/properties.py'
--- storm/properties.py	2011-02-28 21:16:29 +0000
+++ storm/properties.py	2019-06-05 11:42:41 +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 __future__ import print_function
+
 from bisect import insort_left, bisect_left
 import weakref
 import sys

=== modified file 'storm/references.py'
--- storm/references.py	2013-06-28 08:13:08 +0000
+++ storm/references.py	2019-06-05 11:42:41 +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 __future__ import print_function
+
 import weakref
 
 from storm.exceptions import (

=== modified file 'storm/schema/__init__.py'
--- storm/schema/__init__.py	2014-11-18 19:38:53 +0000
+++ storm/schema/__init__.py	2019-06-05 11:42:41 +0000
@@ -18,4 +18,6 @@
 # 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 print_function
+
 from storm.schema.schema import Schema

=== modified file 'storm/schema/patch.py'
--- storm/schema/patch.py	2014-12-12 11:14:47 +0000
+++ storm/schema/patch.py	2019-06-05 11:42:41 +0000
@@ -34,6 +34,8 @@
 'patch' table in the given L{Store}, and it won't be applied again.
 """
 
+from __future__ import print_function
+
 import sys
 import os
 import re
@@ -207,7 +209,7 @@
       >>> import mypackage
       >>> patch_set = PackagePackage(mypackage, sub_level="foo")
       >>> patch_module = patch_set.get_patch_module(1)
-      >>> print patch_module.__name__
+      >>> print(patch_module.__name__)
       'mypackage.patch_1.foo'
 
     Different sub-levels can be used to apply different patches to different
@@ -222,7 +224,7 @@
       >>> import mypackage
       >>> patch_set = PackagePackage(mypackage)
       >>> patch_module = patch_set.get_patch_module(1)
-      >>> print patch_module.__name__
+      >>> print(patch_module.__name__)
       'mypackage.patch_1'
 
     This simpler structure can be used if you have just one store to patch

=== modified file 'storm/schema/schema.py'
--- storm/schema/schema.py	2019-05-30 13:39:54 +0000
+++ storm/schema/schema.py	2019-06-05 11:42:41 +0000
@@ -43,6 +43,8 @@
 upgrade the schema over time.
 """
 
+from __future__ import print_function
+
 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()

=== modified file 'storm/schema/sharding.py'
--- storm/schema/sharding.py	2019-05-30 13:39:54 +0000
+++ storm/schema/sharding.py	2019-06-05 11:42:41 +0000
@@ -41,6 +41,8 @@
 be at the same patch level. See L{storm.schema.patch.PatchSet}.
 """
 
+from __future__ import print_function
+
 from storm.schema.schema import SchemaMissingError, UnappliedPatchesError
 
 

=== modified file 'storm/sqlobject.py'
--- storm/sqlobject.py	2011-10-17 15:59:25 +0000
+++ storm/sqlobject.py	2019-06-05 11:42:41 +0000
@@ -23,6 +23,8 @@
 L{SQLObjectBase} is the central point of compatibility.
 """
 
+from __future__ import print_function
+
 import re
 import warnings
 

=== modified file 'storm/store.py'
--- storm/store.py	2019-06-05 10:41:32 +0000
+++ storm/store.py	2019-06-05 11:42:41 +0000
@@ -24,6 +24,8 @@
 This module contains the highest-level ORM interface in Storm.
 """
 
+from __future__ import print_function
+
 from copy import copy
 from weakref import WeakValueDictionary
 from operator import itemgetter
@@ -237,7 +239,7 @@
         required. An example follows::
 
             join = LeftJoin(Person, Person.id == Company.person_id)
-            print list(store.using(Company, join).find((Company, Person)))
+            print(list(store.using(Company, join).find((Company, Person))))
 
         The previous code snippet will produce an SQL statement
         somewhat similar to this, depending on your backend::

=== modified file 'storm/testing.py'
--- storm/testing.py	2012-03-21 14:43:26 +0000
+++ storm/testing.py	2019-06-05 11:42:41 +0000
@@ -1,3 +1,5 @@
+from __future__ import print_function
+
 from fixtures import Fixture
 
 from storm.tracer import BaseStatementTracer, install_tracer, remove_tracer
@@ -10,7 +12,7 @@
 
         with CaptureTracer() as tracer:
             # Run queries
-        print tracer.queries  # Print the queries that have been run
+        print(tracer.queries)  # Print the queries that have been run
 
     @note: This class requires the fixtures package to be available.
     """

=== modified file 'storm/tracer.py'
--- storm/tracer.py	2012-06-28 13:08:48 +0000
+++ storm/tracer.py	2019-06-05 11:42:41 +0000
@@ -1,3 +1,5 @@
+from __future__ import print_function
+
 from datetime import datetime
 import re
 import sys

=== modified file 'storm/twisted/testing.py'
--- storm/twisted/testing.py	2011-11-30 14:16:50 +0000
+++ storm/twisted/testing.py	2019-06-05 11:42:41 +0000
@@ -1,3 +1,5 @@
+from __future__ import print_function
+
 import transaction
 
 from twisted.python.failure import Failure

=== modified file 'storm/twisted/transact.py'
--- storm/twisted/transact.py	2019-05-30 13:39:54 +0000
+++ storm/twisted/transact.py	2019-06-05 11:42:41 +0000
@@ -1,3 +1,5 @@
+from __future__ import print_function
+
 import time
 import random
 import transaction

=== modified file 'storm/tz.py'
--- storm/tz.py	2007-08-07 18:36:04 +0000
+++ storm/tz.py	2019-06-05 11:42:41 +0000
@@ -4,6 +4,8 @@
 This module offers extensions to the standard python 2.3+
 datetime module.
 """
+from __future__ import print_function
+
 __author__ = "Gustavo Niemeyer <[e-mail]>"
 __license__ = "PSF License"
 

=== modified file 'storm/uri.py'
--- storm/uri.py	2008-01-30 13:03:27 +0000
+++ storm/uri.py	2019-06-05 11:42:41 +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 __future__ import print_function
+
 from urllib import quote
 
 from storm.exceptions import URIError

=== modified file 'storm/variables.py'
--- storm/variables.py	2019-06-05 10:41:32 +0000
+++ storm/variables.py	2019-06-05 11:42:41 +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 __future__ import print_function
+
 from datetime import datetime, date, time, timedelta
 from decimal import Decimal
 from functools import partial

=== modified file 'storm/wsgi.py'
--- storm/wsgi.py	2012-06-04 14:14:50 +0000
+++ storm/wsgi.py	2019-06-05 11:42:41 +0000
@@ -21,6 +21,8 @@
 
 """Glue to wire a storm timeline tracer up to a WSGI app."""
 
+from __future__ import print_function
+
 import threading
 import weakref
 

=== modified file 'storm/xid.py'
--- storm/xid.py	2012-03-01 13:28:26 +0000
+++ storm/xid.py	2019-06-05 11:42:41 +0000
@@ -19,6 +19,8 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
+from __future__ import print_function
+
 
 class Xid(object):
     """

=== modified file 'storm/zope/__init__.py'
--- storm/zope/__init__.py	2008-07-30 06:07:40 +0000
+++ storm/zope/__init__.py	2019-06-05 11:42:41 +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 __future__ import print_function
+
 from zope.interface import classImplements
 
 from storm.info import ObjectInfo

=== modified file 'storm/zope/adapters.py'
--- storm/zope/adapters.py	2009-03-05 11:17:47 +0000
+++ storm/zope/adapters.py	2019-06-05 11:42:41 +0000
@@ -19,6 +19,8 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
+from __future__ import print_function
+
 from zope.component import adapter
 from zope.interface import implementer
 

=== modified file 'storm/zope/interfaces.py'
--- storm/zope/interfaces.py	2011-04-13 03:20:36 +0000
+++ storm/zope/interfaces.py	2019-06-05 11:42:41 +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 __future__ import print_function
+
 from zope.interface import Interface
 
 from storm.expr import Undef

=== modified file 'storm/zope/metaconfigure.py'
--- storm/zope/metaconfigure.py	2007-08-05 21:59:54 +0000
+++ storm/zope/metaconfigure.py	2019-06-05 11:42:41 +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 __future__ import print_function
+
 from zope import component
 
 from storm.zope.interfaces import IZStorm

=== modified file 'storm/zope/metadirectives.py'
--- storm/zope/metadirectives.py	2007-08-05 21:59:54 +0000
+++ storm/zope/metadirectives.py	2019-06-05 11:42:41 +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 __future__ import print_function
+
 from zope.interface import Interface
 from zope.schema import TextLine
 

=== modified file 'storm/zope/schema.py'
--- storm/zope/schema.py	2010-08-17 14:00:59 +0000
+++ storm/zope/schema.py	2019-06-05 11:42:41 +0000
@@ -19,6 +19,8 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 """ZStorm-aware schema manager."""
+from __future__ import print_function
+
 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	2019-06-05 11:42:41 +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 __future__ import print_function
+
 import os
 import shutil
 

=== modified file 'storm/zope/zstorm.py'
--- storm/zope/zstorm.py	2012-03-28 10:57:43 +0000
+++ storm/zope/zstorm.py	2019-06-05 11:42:41 +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 __future__ import print_function
+
 import threading
 import weakref
 

=== modified file 'tests/__init__.py'
--- tests/__init__.py	2011-12-07 10:56:24 +0000
+++ tests/__init__.py	2019-06-05 11:42:41 +0000
@@ -19,6 +19,8 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
+from __future__ import print_function
+
 __all__ = [
     'find_tests',
     'has_fixtures',
@@ -111,6 +113,7 @@
                             os.path.basename(relpath),
                             module_relative=True,
                             package=parent_module,
+                            globs={"print_function": print_function},
                             optionflags=doctest.ELLIPSIS))
 
     return suite

=== modified file 'tests/base.py'
--- tests/base.py	2007-07-18 21:41:04 +0000
+++ tests/base.py	2019-06-05 11:42:41 +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 __future__ import print_function
+
 import weakref
 import gc
 

=== modified file 'tests/cache.py'
--- tests/cache.py	2011-07-14 11:15:30 +0000
+++ tests/cache.py	2019-06-05 11:42:41 +0000
@@ -1,3 +1,5 @@
+from __future__ import print_function
+
 from unittest import defaultTestLoader
 
 from storm.properties import Int

=== modified file 'tests/database.py'
--- tests/database.py	2013-02-15 17:00:18 +0000
+++ tests/database.py	2019-06-05 11:42:41 +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 __future__ import print_function
+
 import sys
 import new
 import gc

=== modified file 'tests/databases/base.py'
--- tests/databases/base.py	2019-05-30 13:39:54 +0000
+++ tests/databases/base.py	2019-06-05 11:42:41 +0000
@@ -20,6 +20,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 __future__ import print_function
+
 from datetime import datetime, date, time, timedelta
 import cPickle as pickle
 import shutil

=== modified file 'tests/databases/postgres.py'
--- tests/databases/postgres.py	2019-05-31 19:00:58 +0000
+++ tests/databases/postgres.py	2019-06-05 11:42:41 +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 __future__ import print_function
+
 from datetime import date, time, timedelta
 import os
 import json

=== modified file 'tests/databases/proxy.py'
--- tests/databases/proxy.py	2007-10-24 06:27:06 +0000
+++ tests/databases/proxy.py	2019-06-05 11:42:41 +0000
@@ -20,6 +20,8 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
+from __future__ import print_function
+
 import os
 import select
 import socket

=== modified file 'tests/databases/sqlite.py'
--- tests/databases/sqlite.py	2019-05-30 13:39:54 +0000
+++ tests/databases/sqlite.py	2019-06-05 11:42:41 +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 __future__ import print_function
+
 from datetime import timedelta
 import time
 import os

=== modified file 'tests/event.py'
--- tests/event.py	2008-06-18 15:27:03 +0000
+++ tests/event.py	2019-06-05 11:42:41 +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 __future__ import print_function
+
 from storm.event import EventSystem
 
 from tests.helper import TestHelper

=== modified file 'tests/expr.py'
--- tests/expr.py	2019-06-05 10:41:32 +0000
+++ tests/expr.py	2019-06-05 11:42:41 +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 __future__ import print_function
+
 from decimal import Decimal
 import unittest
 

=== modified file 'tests/helper.py'
--- tests/helper.py	2019-06-03 08:45:24 +0000
+++ tests/helper.py	2019-06-05 11:42:41 +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 __future__ import print_function
+
 from cStringIO import StringIO
 import tempfile
 import logging

=== modified file 'tests/info.py'
--- tests/info.py	2011-12-07 11:57:07 +0000
+++ tests/info.py	2019-06-05 11:42:41 +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 __future__ import print_function
+
 from weakref import ref
 import gc
 

=== modified file 'tests/mocker.py'
--- tests/mocker.py	2019-06-03 08:45:24 +0000
+++ tests/mocker.py	2019-06-05 11:42:41 +0000
@@ -3,6 +3,8 @@
 
 Graceful platform for test doubles in Python (mocks, stubs, fakes, and dummies).
 """
+from __future__ import print_function
+
 import __builtin__
 import tempfile
 import unittest

=== modified file 'tests/properties.py'
--- tests/properties.py	2019-06-03 08:45:24 +0000
+++ tests/properties.py	2019-06-05 11:42:41 +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 __future__ import print_function
+
 from datetime import datetime, date, time, timedelta
 from decimal import Decimal as decimal
 import gc

=== modified file 'tests/schema/patch.py'
--- tests/schema/patch.py	2019-05-30 13:39:54 +0000
+++ tests/schema/patch.py	2019-06-05 11:42:41 +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 __future__ import print_function
+
 import traceback
 import sys
 import os

=== modified file 'tests/schema/schema.py'
--- tests/schema/schema.py	2015-01-26 09:57:25 +0000
+++ tests/schema/schema.py	2019-06-05 11:42:41 +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 __future__ import print_function
+
 import os
 import sys
 

=== modified file 'tests/schema/sharding.py'
--- tests/schema/sharding.py	2014-12-18 11:37:22 +0000
+++ tests/schema/sharding.py	2019-06-05 11:42:41 +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 __future__ import print_function
+
 from tests.mocker import MockerTestCase
 
 from storm.schema.schema import SchemaMissingError, UnappliedPatchesError

=== modified file 'tests/sqlobject.py'
--- tests/sqlobject.py	2016-03-01 11:44:05 +0000
+++ tests/sqlobject.py	2019-06-05 11:42:41 +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 __future__ import print_function
+
 import datetime
 import operator
 

=== modified file 'tests/store/base.py'
--- tests/store/base.py	2019-06-05 10:41:32 +0000
+++ tests/store/base.py	2019-06-05 11:42:41 +0000
@@ -20,6 +20,8 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
+from __future__ import print_function
+
 import cPickle as pickle
 from cStringIO import StringIO
 import decimal

=== modified file 'tests/store/postgres.py'
--- tests/store/postgres.py	2012-03-08 13:46:23 +0000
+++ tests/store/postgres.py	2019-06-05 11:42:41 +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 __future__ import print_function
+
 import os
 import gc
 

=== modified file 'tests/store/sqlite.py'
--- tests/store/sqlite.py	2011-02-14 12:17:54 +0000
+++ tests/store/sqlite.py	2019-06-05 11:42:41 +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 __future__ import print_function
+
 from storm.databases.sqlite import SQLite
 from storm.uri import URI
 

=== modified file 'tests/tracer.py'
--- tests/tracer.py	2019-05-30 13:39:54 +0000
+++ tests/tracer.py	2019-06-05 11:42:41 +0000
@@ -1,3 +1,5 @@
+from __future__ import print_function
+
 import datetime
 import os
 import sys

=== modified file 'tests/tutorial.txt'
--- tests/tutorial.txt	2016-03-10 12:04:01 +0000
+++ tests/tutorial.txt	2019-06-05 11:42:41 +0000
@@ -73,7 +73,7 @@
 >>> joe = Person()
 >>> joe.name = u"Joe Johnes"
 
->>> print "%r, %r" % (joe.id, joe.name)
+>>> print("%r, %r" % (joe.id, joe.name))
 None, u'Joe Johnes'
 
 }}}
@@ -85,7 +85,7 @@
 >>> store.add(joe)
 <...Person object at 0x...>
 
->>> print "%r, %r" % (joe.id, joe.name)
+>>> print("%r, %r" % (joe.id, joe.name))
 None, u'Joe Johnes'
 
 }}}
@@ -116,7 +116,7 @@
 {{{#!python
 >>> person = store.find(Person, Person.name == u"Joe Johnes").one()
 
->>> print "%r, %r" % (person.id, person.name)
+>>> print("%r, %r" % (person.id, person.name))
 1, u'Joe Johnes'
 
 >>>
@@ -168,11 +168,11 @@
 >>> store.add(mary)
 <...Person object at 0x...>
 
->>> print "%r, %r" % (mary.id, mary.name)
+>>> print("%r, %r" % (mary.id, mary.name))
 None, u'Mary Margaret'
 
 >>> store.flush()
->>> print "%r, %r" % (mary.id, mary.name)
+>>> print("%r, %r" % (mary.id, mary.name))
 2, u'Mary Margaret'
 
 }}}
@@ -240,7 +240,7 @@
 Actually, something happened.. with Joe.  He's back!
 
 {{{#!python
->>> print "%r, %r" % (joe.id, joe.name)
+>>> print("%r, %r" % (joe.id, joe.name))
 1, u'Joe Johnes'
 
 }}}
@@ -279,7 +279,7 @@
 {{{
 >>> circus = Company(u"Circus Inc.")
 
->>> print "%r, %r" % (circus.id, circus.name)
+>>> print("%r, %r" % (circus.id, circus.name))
 None, u'Circus Inc.'
 
 }}}
@@ -327,7 +327,7 @@
 {{{#!python
 >>> ben = store.add(Employee(u"Ben Bill"))
 
->>> print "%r, %r, %r" % (ben.id, ben.name, ben.company_id)
+>>> print("%r, %r, %r" % (ben.id, ben.name, ben.company_id))
 None, u'Ben Bill', None
 
 }}}
@@ -338,7 +338,7 @@
 {{{#!python
 >>> ben.company = circus
 
->>> print "%r, %r" % (ben.company_id, ben.company.name)
+>>> print("%r, %r" % (ben.company_id, ben.company.name))
 None, u'Circus Inc.'
 
 }}}
@@ -354,7 +354,7 @@
 {{{#!python
 >>> store.flush()
 
->>> print "%r, %r" % (ben.company_id, ben.company.name)
+>>> print("%r, %r" % (ben.company_id, ben.company.name))
 1, u'Circus Inc.'
 
 }}}
@@ -419,8 +419,8 @@
 1
 
 >>> for employee in sweets.employees:
-...     print "%r, %r" % (employee.id, employee.name)
-...     print employee is ben
+...     print("%r, %r" % (employee.id, employee.name))
+...     print(employee is ben)
 ...
 1, u'Ben Bill'
 True
@@ -742,11 +742,11 @@
 {{{#!python
 >>> class PersonWithHook(Person):
 ...     def __init__(self, name):
-...         print "Creating %s" % name
+...         print("Creating %s" % name)
 ...         self.name = name
 ...
 ...     def __storm_loaded__(self):
-...         print "Loaded %s" % self.name
+...         print("Loaded %s" % self.name)
 
 
 >>> earl = store.add(PersonWithHook(u"Earl Easton"))
@@ -803,11 +803,11 @@
 
 >>> ruy = store.add(Person())
 >>> ruy.name = u"Ruy"
->>> print ruy.id
+>>> print(ruy.id)
 None
 
 >>> ruy.id = AutoReload
->>> print ruy.id
+>>> print(ruy.id)
 4
 
 }}}
@@ -865,7 +865,7 @@
 ...                     Employee.id > AnotherEmployee.id)
 
 >>> for employee1, employee2 in result:
-...     print (employee1.name, employee2.name)
+...     print((employee1.name, employee2.name))
 (u'Mike Mayer', u'Ben Bill')
 
 }}}

=== modified file 'tests/twisted/__init__.py'
--- tests/twisted/__init__.py	2011-12-07 10:56:24 +0000
+++ tests/twisted/__init__.py	2019-06-05 11:42:41 +0000
@@ -1,3 +1,5 @@
+from __future__ import print_function
+
 __all__ = [
     'has_twisted',
     ]

=== modified file 'tests/twisted/transact.py'
--- tests/twisted/transact.py	2011-12-07 13:23:25 +0000
+++ tests/twisted/transact.py	2019-06-05 11:42:41 +0000
@@ -1,3 +1,5 @@
+from __future__ import print_function
+
 from tests import has_psycopg
 from tests.helper import TestHelper
 from tests.zope import has_transaction, has_zope_component

=== modified file 'tests/uri.py'
--- tests/uri.py	2008-01-30 13:03:27 +0000
+++ tests/uri.py	2019-06-05 11:42:41 +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 __future__ import print_function
+
 from storm.uri import URI, URIError
 
 from tests.helper import TestHelper

=== modified file 'tests/variables.py'
--- tests/variables.py	2019-06-05 10:41:32 +0000
+++ tests/variables.py	2019-06-05 11:42:41 +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 __future__ import print_function
+
 from datetime import datetime, date, time, timedelta
 from decimal import Decimal
 import cPickle as pickle

=== modified file 'tests/wsgi.py'
--- tests/wsgi.py	2012-06-04 14:14:50 +0000
+++ tests/wsgi.py	2019-06-05 11:42:41 +0000
@@ -1,3 +1,5 @@
+from __future__ import print_function
+
 import Queue
 from unittest import TestCase
 import threading

=== modified file 'tests/zope/__init__.py'
--- tests/zope/__init__.py	2011-09-13 10:43:40 +0000
+++ tests/zope/__init__.py	2019-06-05 11:42:41 +0000
@@ -18,6 +18,8 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
+from __future__ import print_function
+
 __all__ = [
     'has_transaction',
     'has_zope_component',

=== modified file 'tests/zope/adapters.py'
--- tests/zope/adapters.py	2009-03-05 21:53:12 +0000
+++ tests/zope/adapters.py	2019-06-05 11:42:41 +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 __future__ import print_function
+
 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	2019-06-05 11:42:41 +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 __future__ import print_function
+
 import os
 import sys
 

=== modified file 'tests/zope/zstorm.py'
--- tests/zope/zstorm.py	2019-05-31 15:28:04 +0000
+++ tests/zope/zstorm.py	2019-06-05 11:42:41 +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 __future__ import print_function
+
 import threading
 import weakref
 import gc