Merge lp:~cjwatson/storm/py3-misc-functions into lp:storm

[Colin Watson]

Make various small adjustments to cope with changes in Python 3.

These are all small and hopefully uncontroversial, so I decided to just bundle them into a single MP.

[Kristian Glass (doismellburning)]

review: Approve

=== modified file 'tests/cache.py'
--- tests/cache.py	2019-06-05 11:41:07 +0000
+++ tests/cache.py	2019-08-11 12:37:39 +0000
@@ -136,7 +136,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)
 
@@ -257,7 +257,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)
 
@@ -300,7 +300,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	2019-06-25 21:33:26 +0000
+++ tests/database.py	2019-08-11 12:37:39 +0000
@@ -21,7 +21,7 @@
 from __future__ import print_function
 
 import sys
-import new
+import types
 import gc
 
 from storm.exceptions import ClosedError, DatabaseError, DisconnectionError
@@ -522,7 +522,7 @@
 
     def setUp(self):
         TestHelper.setUp(self)
-        self.db_module = new.module("db_module")
+        self.db_module = types.ModuleType("db_module")
         self.uri = None
         def create_from_uri(uri):
             self.uri = uri
 
=== modified file 'tests/helper.py'
--- tests/helper.py	2019-06-05 11:41:07 +0000
+++ tests/helper.py	2019-08-11 12:37:39 +0000
@@ -20,12 +20,13 @@
 #
 from __future__ import print_function
 
-from cStringIO import StringIO
 import tempfile
 import logging
 import shutil
 import sys
 
+from six.moves import cStringIO as StringIO
+
 from tests import mocker
 
 
 
=== modified file 'tests/schema/schema.py'
--- tests/schema/schema.py	2019-06-05 11:41:07 +0000
+++ tests/schema/schema.py	2019-08-11 12:37:39 +0000
@@ -67,9 +67,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 any(name.startswith("%s." % x) for x in self._package_names):
                 del sys.modules[name]
 
         super(SchemaTest, self).tearDown()
 
=== modified file 'tests/store/base.py'
--- tests/store/base.py	2019-06-07 17:14:33 +0000
+++ tests/store/base.py	2019-08-11 12:37:39 +0000
@@ -22,7 +22,6 @@
 
 from __future__ import print_function
 
-from cStringIO import StringIO
 import decimal
 import gc
 import operator
@@ -30,7 +29,7 @@
 import weakref
 
 import six
-from six.moves import cPickle as pickle
+from six.moves import cPickle as pickle, cStringIO as StringIO
 
 from storm.references import Reference, ReferenceSet, Proxy
 from storm.database import Result, STATE_DISCONNECTED
 
=== modified file 'tests/tracer.py'
--- tests/tracer.py	2019-06-05 11:41:07 +0000
+++ tests/tracer.py	2019-08-11 12:37:39 +0000
@@ -130,7 +130,7 @@
 
     def setUp(self):
         super(DebugTracerTest, self).setUp()
-        self.stream = self.mocker.mock(file)
+        self.stream = self.mocker.mock(type(sys.stderr))
         self.tracer = DebugTracer(self.stream)
 
         datetime_mock = self.mocker.replace("datetime.datetime")