Merge lp:~cjwatson/storm/pyupgrade into lp:storm

[Colin Watson]

Run pyupgrade.

Generated using `find storm -name \*.py | xargs pyupgrade --py3-plus --keep-percent-format`.

Unmerged revisions

585. By Colin Watson on 2024-03-13

Run pyupgrade.

Generated using `find storm -name \*.py | xargs pyupgrade --py3-plus
--keep-percent-format`.

=== modified file 'storm/__init__.py'
--- storm/__init__.py	2024-03-04 10:59:55 +0000
+++ storm/__init__.py	2024-03-13 16:26:38 +0000
@@ -32,7 +32,7 @@
 version_info = tuple([int(x) for x in version.split(".")])
 
 
-class UndefType(object):
+class UndefType:
 
     def __repr__(self):
         return "Undef"
 
=== modified file 'storm/cache.py'
--- storm/cache.py	2024-03-04 10:59:55 +0000
+++ storm/cache.py	2024-03-13 16:26:38 +0000
@@ -1,7 +1,7 @@
 import itertools
 
 
-class Cache(object):
+class Cache:
     """Prevents recently used objects from being deallocated.
 
     This prevents recently used objects from being deallocated by Python
@@ -69,7 +69,7 @@
         return list(self._order)
 
 
-class GenerationalCache(object):
+class GenerationalCache:
     """Generational replacement for Storm's LRU cache.
 
     This cache approximates LRU without keeping exact track.  Instead,
 
=== modified file 'storm/database.py'
--- storm/database.py	2024-03-04 10:59:55 +0000
+++ storm/database.py	2024-03-13 16:26:38 +0000
@@ -49,7 +49,7 @@
 STATE_RECONNECT = 3
 
 
-class Result(object):
+class Result:
     """A representation of the results from a single SQL statement."""
 
     _closed = False
@@ -164,12 +164,12 @@
         return row
 
 
-class CursorWrapper(object):
+class CursorWrapper:
     """A DB-API cursor, wrapping exceptions as StormError instances."""
 
     def __init__(self, cursor, database):
-        super(CursorWrapper, self).__setattr__('_cursor', cursor)
-        super(CursorWrapper, self).__setattr__('_database', database)
+        super().__setattr__('_cursor', cursor)
+        super().__setattr__('_database', database)
 
     def __getattr__(self, name):
         attr = getattr(self._cursor, name)
@@ -188,8 +188,7 @@
 
     def __iter__(self):
         with wrap_exceptions(self._database):
-            for item in self._cursor:
-                yield item
+            yield from self._cursor
 
     def __enter__(self):
         return self
@@ -199,7 +198,7 @@
             self.close()
 
 
-class ConnectionWrapper(object):
+class ConnectionWrapper:
     """A DB-API connection, wrapping exceptions as StormError instances."""
 
     def __init__(self, connection, database):
@@ -236,7 +235,7 @@
             return CursorWrapper(self._connection.cursor(), self._database)
 
 
-class Connection(object):
+class Connection:
     """A connection to a database.
 
     @cvar result_factory: A callable which takes this L{Connection}
@@ -544,7 +543,7 @@
         """
 
 
-class Database(object):
+class Database:
     """A database that can be connected to.
 
     This should be subclassed for individual database backends.
 
=== modified file 'storm/databases/__init__.py'
--- storm/databases/__init__.py	2024-03-04 10:59:55 +0000
+++ storm/databases/__init__.py	2024-03-13 16:26:38 +0000
@@ -20,7 +20,7 @@
 #
 
 
-class Dummy(object):
+class Dummy:
     """Magic "infectious" class.
 
     This class simplifies nice errors on the creation of
 
=== modified file 'storm/databases/mysql.py'
--- storm/databases/mysql.py	2024-03-04 10:59:55 +0000
+++ storm/databases/mysql.py	2024-03-13 16:26:38 +0000
@@ -139,7 +139,7 @@
     _converters = None
 
     def __init__(self, uri):
-        super(MySQL, self).__init__(uri)
+        super().__init__(uri)
         if MySQLdb is dummy:
             raise DatabaseModuleError("'MySQLdb' module not found")
         self._connect_kwargs = {}
 
=== modified file 'storm/databases/postgres.py'
--- storm/databases/postgres.py	2024-03-04 16:33:02 +0000
+++ storm/databases/postgres.py	2024-03-13 16:26:38 +0000
@@ -369,7 +369,7 @@
     _version = None
 
     def __init__(self, uri):
-        super(Postgres, self).__init__(uri)
+        super().__init__(uri)
         if psycopg2 is dummy:
             raise DatabaseModuleError(
                 "'psycopg2' >= %s not found. Found %s."
@@ -400,15 +400,14 @@
     _psycopg_error_attributes = tuple(_psycopg_error_attributes)
 
     def _make_combined_exception_type(self, wrapper_type, dbapi_type):
-        combined_type = super(Postgres, self)._make_combined_exception_type(
+        combined_type = super()._make_combined_exception_type(
             wrapper_type, dbapi_type)
         for name in self._psycopg_error_attributes:
             setattr(combined_type, name, lambda err: getattr(err, "_" + name))
         return combined_type
 
     def _wrap_exception(self, wrapper_type, exception):
-        wrapped = super(Postgres, self)._wrap_exception(
-            wrapper_type, exception)
+        wrapped = super()._wrap_exception(wrapper_type, exception)
         for name in self._psycopg_error_attributes:
             setattr(wrapped, "_" + name, getattr(exception, name))
         return wrapped
 
=== modified file 'storm/databases/sqlite.py'
--- storm/databases/sqlite.py	2024-03-04 10:59:55 +0000
+++ storm/databases/sqlite.py	2024-03-13 16:26:38 +0000
@@ -163,7 +163,7 @@
     _exception_module = sqlite
 
     def __init__(self, uri):
-        super(SQLite, self).__init__(uri)
+        super().__init__(uri)
         if sqlite is dummy:
             raise DatabaseModuleError("'pysqlite2' module not found")
         self._filename = uri.database or ":memory:"
 
=== modified file 'storm/docs/conf.py'
--- storm/docs/conf.py	2020-05-26 10:28:24 +0000
+++ storm/docs/conf.py	2024-03-13 16:26:38 +0000
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-#
 # Configuration file for the Sphinx documentation builder.
 #
 # This file does only contain a selection of the most common options. For a
 
=== modified file 'storm/event.py'
--- storm/event.py	2024-03-04 10:59:55 +0000
+++ storm/event.py	2024-03-13 16:26:38 +0000
@@ -26,7 +26,7 @@
 __all__ = ["EventSystem"]
 
 
-class EventSystem(object):
+class EventSystem:
     """A system for managing hooks that are called when events are emitted.
 
     Hooks are callables that take the event system C{owner} as their first
 
=== modified file 'storm/expr.py'
--- storm/expr.py	2024-03-04 10:59:55 +0000
+++ storm/expr.py	2024-03-13 16:26:38 +0000
@@ -45,7 +45,7 @@
     return decorator
 
 
-class Compile(object):
+class Compile:
     """Compiler based on the concept of generic functions."""
 
     def __init__(self, parent=None):
@@ -145,7 +145,7 @@
             return "(%s)" % statement
         return statement
 
-    def __call__(self, expr, state=None, join=u", ", raw=False, token=False):
+    def __call__(self, expr, state=None, join=", ", raw=False, token=False):
         """Compile the given expression into a SQL statement.
 
         @param expr: The expression to compile.
@@ -217,7 +217,7 @@
         return namespace['closure'](state.parameters, bool)
 
 
-class State(object):
+class State:
     """All the data necessary during compilation of an expression.
 
     @ivar aliases: Dict of L{Column} instances to L{Alias} instances,
@@ -276,7 +276,7 @@
 # --------------------------------------------------------------------
 # Expression contexts
 
-class Context(object):
+class Context:
     """
     An object used to specify the nature of expected SQL expressions
     being compiled in a given context.
@@ -395,13 +395,13 @@
 # A translation table that can escape a unicode string for use in a
 # Like() expression that uses "!" as the escape character.
 like_escape = {
-    ord(u"!"): u"!!",
-    ord(u"_"): u"!_",
-    ord(u"%"): u"!%"
+    ord("!"): "!!",
+    ord("_"): "!_",
+    ord("%"): "!%"
     }
 
 
-class Comparable(object):
+class Comparable:
     __slots__ = ()
     __hash__ = object.__hash__
 
@@ -511,20 +511,20 @@
     def startswith(self, prefix, case_sensitive=None):
         if not isinstance(prefix, str):
             raise ExprError("Expected text argument, got %r" % type(prefix))
-        pattern = prefix.translate(like_escape) + u"%"
-        return Like(self, pattern, u"!", case_sensitive)
+        pattern = prefix.translate(like_escape) + "%"
+        return Like(self, pattern, "!", case_sensitive)
 
     def endswith(self, suffix, case_sensitive=None):
         if not isinstance(suffix, str):
             raise ExprError("Expected text argument, got %r" % type(suffix))
-        pattern = u"%" + suffix.translate(like_escape)
-        return Like(self, pattern, u"!", case_sensitive)
+        pattern = "%" + suffix.translate(like_escape)
+        return Like(self, pattern, "!", case_sensitive)
 
     def contains_string(self, substring, case_sensitive=None):
         if not isinstance(substring, str):
             raise ExprError("Expected text argument, got %r" % type(substring))
-        pattern = u"%" + substring.translate(like_escape) + u"%"
-        return Like(self, pattern, u"!", case_sensitive)
+        pattern = "%" + substring.translate(like_escape) + "%"
+        return Like(self, pattern, "!", case_sensitive)
 
 
 class ComparableExpr(Expr, Comparable):
@@ -584,7 +584,7 @@
             break
     else:
         if tables is state.auto_tables:
-            tables = set(compile(table, state, token=True) for table in tables)
+            tables = {compile(table, state, token=True) for table in tables}
             return ", ".join(sorted(tables))
         else:
             return compile(tables, state, token=True)
 
=== modified file 'storm/info.py'
--- storm/info.py	2024-03-04 10:59:55 +0000
+++ storm/info.py	2024-03-13 16:26:38 +0000
@@ -114,12 +114,10 @@
 
         # columns have __eq__ implementations that do things we don't want - we
         # want to look these up in a dict and use identity semantics
-        id_positions = dict((id(column), i)
-                             for i, column in enumerate(self.columns))
+        id_positions = {id(column): i for i, column in enumerate(self.columns)}
 
-        self.primary_key_idx = dict((id(column), i)
-                                    for i, column in
-                                    enumerate(self.primary_key))
+        self.primary_key_idx = {id(column): i
+                                for i, column in enumerate(self.primary_key)}
         self.primary_key_pos = tuple(id_positions[id(column)]
                                      for column in self.primary_key)
 
@@ -202,7 +200,7 @@
     from storm.cextensions import ObjectInfo, get_obj_info
 
 
-class ClassAlias(object):
+class ClassAlias:
     """Create a named alias for a Storm class for use in queries.
 
     This is useful basically when the SQL 'AS' feature is desired in code using
 
=== modified file 'storm/properties.py'
--- storm/properties.py	2024-03-04 10:59:55 +0000
+++ storm/properties.py	2024-03-13 16:26:38 +0000
@@ -39,7 +39,7 @@
            "Pickle", "JSON", "List", "PropertyRegistry"]
 
 
-class Property(object):
+class Property:
     """A property representing a database column.
 
     Properties can be set as attributes of classes that have a
@@ -363,7 +363,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 = {value: key for key, value in set_map.items()}
         if "set_map" in kwargs:
             set_map = dict(kwargs.pop("set_map"))
 
@@ -372,7 +372,7 @@
         SimpleProperty.__init__(self, name, primary, **kwargs)
 
 
-class PropertyRegistry(object):
+class PropertyRegistry:
     """
     An object which remembers the Storm properties specified on
     classes, and is able to translate names to these properties.
 
=== modified file 'storm/references.py'
--- storm/references.py	2024-03-04 10:59:55 +0000
+++ storm/references.py	2024-03-13 16:26:38 +0000
@@ -33,7 +33,7 @@
 __all__ = ["Reference", "ReferenceSet", "Proxy"]
 
 
-class LazyAttribute(object):
+class LazyAttribute:
     """
     This descriptor will call the named attribute builder to
     initialize the given attribute on first access.  It avoids
@@ -63,7 +63,7 @@
 PendingReferenceValue = PendingReferenceValue()
 
 
-class Reference(object):
+class Reference:
     """Descriptor for one-to-one relationships.
 
     This is typically used when the class that it is being defined on
@@ -212,7 +212,7 @@
     __hash__ = object.__hash__
 
 
-class ReferenceSet(object):
+class ReferenceSet:
     """Descriptor for many-to-one and many-to-many reference sets.
 
     This is typically used when another class has a foreign key onto the
@@ -335,7 +335,7 @@
             self._relation2 = None
 
 
-class BoundReferenceSetBase(object):
+class BoundReferenceSetBase:
 
     def find(self, *args, **kwargs):
         store = Store.of(self._local)
@@ -471,7 +471,7 @@
     a native property of C{Foo}.
     """
 
-    class RemoteProp(object):
+    class RemoteProp:
         """
         This descriptor will resolve and set the _remote_prop attribute
         when it's first used. It avoids having a test at every single
@@ -517,7 +517,7 @@
     return compile(proxy._remote_prop, state)
 
 
-class Relation(object):
+class Relation:
 
     def __init__(self, local_key, remote_key, many, on_remote):
         assert type(local_key) is tuple and type(remote_key) is tuple
@@ -963,7 +963,7 @@
             return self._r_to_l.setdefault(local_cls, map).get(remote_column)
 
 
-class PropertyResolver(object):
+class PropertyResolver:
     """Transform strings and pure properties (non-columns) into columns."""
 
     def __init__(self, reference, used_cls):
 
=== modified file 'storm/schema/patch.py'
--- storm/schema/patch.py	2024-03-04 10:59:55 +0000
+++ storm/schema/patch.py	2024-03-13 16:26:38 +0000
@@ -61,7 +61,7 @@
     """Raised when a patch failing with a random exception is found."""
 
 
-class Patch(object):
+class Patch:
     """Database object representing an applied patch.
 
     @version: The version of the patch associated with this object.
@@ -75,7 +75,7 @@
         self.version = version
 
 
-class PatchApplier(object):
+class PatchApplier:
     """Apply to a L{Store} the database patches from a given Python package.
 
     @param store: The L{Store} to apply the patches to.
@@ -189,7 +189,7 @@
         return applied
 
 
-class PatchSet(object):
+class PatchSet:
     """A collection of patch modules.
 
     Each patch module lives in a regular Python module file, contained in a
@@ -269,7 +269,7 @@
         return os.path.dirname(self._package.__file__)
 
 
-class _EmptyPatchModule(object):
+class _EmptyPatchModule:
     """Fake module object with a no-op C{apply} function."""
 
     def apply(self, store):
 
=== modified file 'storm/schema/schema.py'
--- storm/schema/schema.py	2024-03-04 10:59:55 +0000
+++ storm/schema/schema.py	2024-03-13 16:26:38 +0000
@@ -63,7 +63,7 @@
         self.unapplied_versions = unapplied_versions
 
 
-class Schema(object):
+class Schema:
     """Create, drop, clean and patch table schemas.
 
     @param creates: A list of C{CREATE TABLE} statements.
@@ -194,7 +194,7 @@
         return PatchApplier(store, self._patch_set, committer)
 
 
-class _NoopCommitter(object):
+class _NoopCommitter:
     """Dummy committer that does nothing."""
 
     def commit(self):
 
=== modified file 'storm/schema/sharding.py'
--- storm/schema/sharding.py	2024-03-04 10:59:55 +0000
+++ storm/schema/sharding.py	2024-03-13 16:26:38 +0000
@@ -48,7 +48,7 @@
     """Raised when stores don't have all the same patch level."""
 
 
-class Sharding(object):
+class Sharding:
     """Manage L{Shema}s over a collection of L{Store}s."""
 
     def __init__(self):
 
=== modified file 'storm/sqlobject.py'
--- storm/sqlobject.py	2024-03-04 10:59:55 +0000
+++ storm/sqlobject.py	2024-03-13 16:26:38 +0000
@@ -61,7 +61,7 @@
     pass
 
 
-class SQLObjectStyle(object):
+class SQLObjectStyle:
 
     longID = False
 
@@ -212,7 +212,7 @@
         attr_to_prop[id_name] = "id"
 
         # Notice that obj is the class since this is the metaclass.
-        obj = super(SQLObjectMeta, cls).__new__(cls, name, bases, dict)
+        obj = super().__new__(cls, name, bases, dict)
 
         property_registry = obj._storm_property_registry
 
@@ -239,14 +239,14 @@
         return obj
 
 
-class DotQ(object):
+class DotQ:
     """A descriptor that mimics the SQLObject 'Table.q' syntax"""
 
     def __get__(self, obj, cls=None):
         return BoundDotQ(cls)
 
 
-class BoundDotQ(object):
+class BoundDotQ:
 
     def __init__(self, cls):
         self._cls = cls
@@ -374,7 +374,7 @@
         store.autoreload(self)
 
 
-class SQLObjectResultSet(object):
+class SQLObjectResultSet:
     """SQLObject-equivalent of the ResultSet class in Storm.
 
     Storm handles joins in the Store interface, while SQLObject
@@ -638,7 +638,7 @@
 
 
 
-class PropertyAdapter(object):
+class PropertyAdapter:
 
     _kwargs = {}
 
@@ -668,11 +668,11 @@
             default = Undef
         else:
             default_factory = Undef
-        super(PropertyAdapter, self).__init__(dbName, allow_none=not notNull,
-                                              default_factory=default_factory,
-                                              default=default,
-                                              validator=storm_validator,
-                                              **self._kwargs)
+        super().__init__(dbName, allow_none=not notNull,
+                         default_factory=default_factory,
+                         default=default,
+                         validator=storm_validator,
+                         **self._kwargs)
 
 
 # DEPRECATED: On Python 2, this used to be a more relaxed version of
@@ -708,7 +708,7 @@
     pass
 
 
-class ForeignKey(object):
+class ForeignKey:
 
     def __init__(self, foreignKey, **kwargs):
         self.foreignKey = foreignKey
@@ -753,7 +753,7 @@
 class SingleJoin(Reference):
 
     def __init__(self, otherClass, joinColumn, prejoins=_IGNORED):
-        super(SingleJoin, self).__init__(
+        super().__init__(
             "<primary key>", "%s.%s" % (otherClass, joinColumn),
             on_remote=True)
 
 
=== modified file 'storm/store.py'
--- storm/store.py	2024-03-04 10:59:55 +0000
+++ storm/store.py	2024-03-13 16:26:38 +0000
@@ -55,7 +55,7 @@
 PENDING_REMOVE = 2
 
 
-class Store(object):
+class Store:
     """The Storm Store.
 
     This is the highest-level interface to a database. It manages
@@ -479,7 +479,7 @@
             if n > 0:
                 before_set = predecessors.get(after_info)
                 if before_set is None:
-                    predecessors[after_info] = set((before_info,))
+                    predecessors[after_info] = {before_info}
                 else:
                     before_set.add(before_info)
 
@@ -918,7 +918,7 @@
                              result, result.get_one())
 
 
-class ResultSet(object):
+class ResultSet:
     """The representation of the results of a query.
 
     Note that having an instance of this class does not indicate that
@@ -1518,7 +1518,7 @@
         return self._set_expr(Intersect, other, all)
 
 
-class EmptyResultSet(object):
+class EmptyResultSet:
     """An object that looks like a L{ResultSet} but represents no rows.
 
     This is convenient for application developers who want to provide
@@ -1645,7 +1645,7 @@
         return self
 
 
-class TableSet(object):
+class TableSet:
     """The representation of a set of tables which can be queried at once.
 
     This will typically be constructed by a call to L{Store.using}.
@@ -1675,7 +1675,7 @@
 Store._table_set = TableSet
 
 
-class FindSpec(object):
+class FindSpec:
     """The set of tables or expressions in the result of L{Store.find}."""
 
     def __init__(self, cls_spec):
@@ -1859,7 +1859,7 @@
 AutoReload = AutoReload()
 
 
-class block_access(object):
+class block_access:
     """
     Context manager blocks database access by one or more L{Store}\\ s in the
     managed scope.
 
=== modified file 'storm/testing.py'
--- storm/testing.py	2024-03-04 10:59:55 +0000
+++ storm/testing.py	2024-03-13 16:26:38 +0000
@@ -16,7 +16,7 @@
     """
 
     def __init__(self):
-        super(CaptureTracer, self).__init__()
+        super().__init__()
         self.queries = []
 
     def _setUp(self):
 
=== modified file 'storm/tests/cache.py'
--- storm/tests/cache.py	2024-03-04 10:59:55 +0000
+++ storm/tests/cache.py	2024-03-13 16:26:38 +0000
@@ -6,7 +6,7 @@
 from storm.tests.helper import TestHelper
 
 
-class StubObjectInfo(object):
+class StubObjectInfo:
 
     def __init__(self, id):
         self.id = id
@@ -26,7 +26,7 @@
         return self.id < other.id
 
 
-class StubClass(object):
+class StubClass:
 
     __storm_table__ = "stub_class"
 
@@ -38,7 +38,7 @@
     Cache = Cache
 
     def setUp(self):
-        super(BaseCacheTest, self).setUp()
+        super().setUp()
         self.obj_infos = [StubObjectInfo(i) for i in range(10)]
         for i in range(len(self.obj_infos)):
             setattr(self, "obj%d" % (i+1), self.obj_infos[i])
@@ -194,7 +194,7 @@
     Cache = GenerationalCache
 
     def setUp(self):
-        super(TestGenerationalCache, self).setUp()
+        super().setUp()
         self.obj1 = StubObjectInfo(1)
         self.obj2 = StubObjectInfo(2)
         self.obj3 = StubObjectInfo(3)
 
=== modified file 'storm/tests/database.py'
--- storm/tests/database.py	2024-03-04 10:59:55 +0000
+++ storm/tests/database.py	2024-03-13 16:26:38 +0000
@@ -36,7 +36,7 @@
 marker = object()
 
 
-class RawConnection(object):
+class RawConnection:
 
     closed = False
 
@@ -56,7 +56,7 @@
         self.executed.append("CCLOSE")
 
 
-class RawCursor(object):
+class RawCursor:
 
     def __init__(self, arraysize=1, executed=None):
         self.arraysize = arraysize
@@ -91,7 +91,7 @@
         return result
 
 
-class FakeConnection(object):
+class FakeConnection:
 
     def __init__(self):
         self._database = Database()
@@ -100,7 +100,7 @@
         return _function(*args, **kwargs)
 
 
-class FakeTracer(object):
+class FakeTracer:
 
     def __init__(self, stream=None):
         self.seen = []
@@ -538,7 +538,7 @@
         self.assertEqual(self.uri.database, "db")
 
     def test_create_database_with_unicode(self):
-        create_database(u"db_module:db")
+        create_database("db_module:db")
         self.assertTrue(self.uri)
         self.assertEqual(self.uri.scheme, "db_module")
         self.assertEqual(self.uri.database, "db")
 
=== modified file 'storm/tests/databases/base.py'
--- storm/tests/databases/base.py	2024-03-04 10:59:55 +0000
+++ storm/tests/databases/base.py	2024-03-13 16:26:38 +0000
@@ -1,5 +1,3 @@
-
-# -*- encoding: utf-8 -*-
 #
 # Copyright (c) 2006, 2007 Canonical
 #
@@ -41,18 +39,18 @@
 from storm.tests.helper import MakePath
 
 
-class Marker(object):
+class Marker:
     pass
 
 marker = Marker()
 
 
-class DatabaseTest(object):
+class DatabaseTest:
 
     supports_microseconds = True
 
     def setUp(self):
-        super(DatabaseTest, self).setUp()
+        super().setUp()
         self.create_database()
         self.create_connection()
         self.drop_tables()
@@ -64,7 +62,7 @@
         self.drop_tables()
         self.drop_connection()
         self.drop_database()
-        super(DatabaseTest, self).tearDown()
+        super().tearDown()
 
     def create_database(self):
         raise NotImplementedError
@@ -144,7 +142,7 @@
         self.assertTrue(result.get_one())
 
     def test_execute_unicode_result(self):
-        result = self.connection.execute(u"SELECT title FROM test")
+        result = self.connection.execute("SELECT title FROM test")
         self.assertTrue(isinstance(result, Result))
         row = result.get_one()
         self.assertEqual(row, ("Title 10",))
@@ -213,7 +211,7 @@
                                          "VALUES ('Title 30')")
         primary_key = (Column("id", SQLToken("test")),
                        Column("title", SQLToken("test")))
-        primary_variables = (Variable(), Variable(u"Title 30"))
+        primary_variables = (Variable(), Variable("Title 30"))
         expr = result.get_insert_identity(primary_key, primary_variables)
         select = Select(Column("title", SQLToken("test")), expr)
         result = self.connection.execute(select)
@@ -408,7 +406,7 @@
         self.connection.execute("INSERT INTO test VALUES (40, '!!blah')")
         id = Column("id", SQLToken("test"))
         title = Column("title", SQLToken("test"))
-        expr = Select(id, title.startswith(u"!!_%"))
+        expr = Select(id, title.startswith("!!_%"))
         result = list(self.connection.execute(expr))
         self.assertEqual(result, [(30,)])
 
@@ -417,7 +415,7 @@
         self.connection.execute("INSERT INTO test VALUES (40, 'blah!!')")
         id = Column("id", SQLToken("test"))
         title = Column("title", SQLToken("test"))
-        expr = Select(id, title.endswith(u"_%!!"))
+        expr = Select(id, title.endswith("_%!!"))
         result = list(self.connection.execute(expr))
         self.assertEqual(result, [(30,)])
 
@@ -426,7 +424,7 @@
         self.connection.execute("INSERT INTO test VALUES (40, 'blah!!x')")
         id = Column("id", SQLToken("test"))
         title = Column("title", SQLToken("test"))
-        expr = Select(id, title.contains_string(u"_%!!"))
+        expr = Select(id, title.contains_string("_%!!"))
         result = list(self.connection.execute(expr))
         self.assertEqual(result, [(30,)])
 
@@ -459,10 +457,10 @@
             self.assertEqual(('error message',), wrapped.args)
 
 
-class TwoPhaseCommitTest(object):
+class TwoPhaseCommitTest:
 
     def setUp(self):
-        super(TwoPhaseCommitTest, self).setUp()
+        super().setUp()
         self.create_database()
         self.create_connection()
         self.drop_tables()
@@ -471,7 +469,7 @@
     def tearDown(self):
         self.drop_tables()
         self.drop_connection()
-        super(TwoPhaseCommitTest, self).tearDown()
+        super().tearDown()
 
     def create_database(self):
         raise NotImplementedError
@@ -630,7 +628,7 @@
         self.assertFalse(result.get_one())
 
 
-class UnsupportedDatabaseTest(object):
+class UnsupportedDatabaseTest:
 
     helpers = [MakePath]
 
@@ -686,14 +684,14 @@
             sys.modules.update(dbapi_modules)
 
 
-class DatabaseDisconnectionMixin(object):
+class DatabaseDisconnectionMixin:
 
     environment_variable = ""
     host_environment_variable = ""
     default_port = None
 
     def setUp(self):
-        super(DatabaseDisconnectionMixin, self).setUp()
+        super().setUp()
         self.create_database_and_proxy()
         self.create_connection()
 
@@ -701,7 +699,7 @@
         self.drop_connection()
         self.drop_database()
         self.proxy.close()
-        super(DatabaseDisconnectionMixin, self).tearDown()
+        super().tearDown()
 
     def is_supported(self):
         return bool(self.get_uri())
@@ -884,7 +882,7 @@
         self.connection.close()
 
 
-class TwoPhaseCommitDisconnectionTest(object):
+class TwoPhaseCommitDisconnectionTest:
 
     def test_begin_after_rollback_with_disconnection_error(self):
         """
 
=== modified file 'storm/tests/databases/mysql.py'
--- storm/tests/databases/mysql.py	2024-03-04 10:59:55 +0000
+++ storm/tests/databases/mysql.py	2024-03-13 16:26:38 +0000
@@ -99,7 +99,7 @@
         id_column = Column("id", "test")
         id_variable = IntVariable()
         title_column = Column("title", "test")
-        title_variable = UnicodeVariable(u"testing")
+        title_variable = UnicodeVariable("testing")
 
         # This is not part of the table.  It is just used to show that
         # only one primary key variable is set from the insert ID.
@@ -161,4 +161,4 @@
         if "unix_socket" in uri.options:
             return create_proxy_and_uri(uri)[0]
         else:
-            return super(MySQLDisconnectionTest, self).create_proxy(uri)
+            return super().create_proxy(uri)
 
=== modified file 'storm/tests/databases/postgres.py'
--- storm/tests/databases/postgres.py	2024-03-04 10:59:55 +0000
+++ storm/tests/databases/postgres.py	2024-03-13 16:26:38 +0000
@@ -116,7 +116,7 @@
                                 " json JSON)")
 
     def drop_tables(self):
-        super(PostgresTest, self).drop_tables()
+        super().drop_tables()
         tables = ("like_case_insensitive_test", "returning_test", "json_test")
         for table in tables:
             try:
@@ -126,7 +126,7 @@
                 self.connection.rollback()
 
     def create_sample_data(self):
-        super(PostgresTest, self).create_sample_data()
+        super().create_sample_data()
         self.connection.execute("INSERT INTO like_case_insensitive_test "
                                 "(description) VALUES ('hullah')")
         self.connection.execute("INSERT INTO like_case_insensitive_test "
@@ -318,35 +318,35 @@
 
     def test_case_default_like(self):
 
-        like = Like(SQLRaw("description"), u"%hullah%")
+        like = Like(SQLRaw("description"), "%hullah%")
         expr = Select(SQLRaw("id"), like, tables=["like_case_insensitive_test"])
         result = self.connection.execute(expr)
         self.assertEqual(result.get_all(), [(1,)])
 
-        like = Like(SQLRaw("description"), u"%HULLAH%")
+        like = Like(SQLRaw("description"), "%HULLAH%")
         expr = Select(SQLRaw("id"), like, tables=["like_case_insensitive_test"])
         result = self.connection.execute(expr)
         self.assertEqual(result.get_all(), [(2,)])
 
     def test_case_sensitive_like(self):
 
-        like = Like(SQLRaw("description"), u"%hullah%", case_sensitive=True)
+        like = Like(SQLRaw("description"), "%hullah%", case_sensitive=True)
         expr = Select(SQLRaw("id"), like, tables=["like_case_insensitive_test"])
         result = self.connection.execute(expr)
         self.assertEqual(result.get_all(), [(1,)])
 
-        like = Like(SQLRaw("description"), u"%HULLAH%", case_sensitive=True)
+        like = Like(SQLRaw("description"), "%HULLAH%", case_sensitive=True)
         expr = Select(SQLRaw("id"), like, tables=["like_case_insensitive_test"])
         result = self.connection.execute(expr)
         self.assertEqual(result.get_all(), [(2,)])
 
     def test_case_insensitive_like(self):
 
-        like = Like(SQLRaw("description"), u"%hullah%", case_sensitive=False)
+        like = Like(SQLRaw("description"), "%hullah%", case_sensitive=False)
         expr = Select(SQLRaw("id"), like, tables=["like_case_insensitive_test"])
         result = self.connection.execute(expr)
         self.assertEqual(result.get_all(), [(1,), (2,)])
-        like = Like(SQLRaw("description"), u"%HULLAH%", case_sensitive=False)
+        like = Like(SQLRaw("description"), "%HULLAH%", case_sensitive=False)
         expr = Select(SQLRaw("id"), like, tables=["like_case_insensitive_test"])
         result = self.connection.execute(expr)
         self.assertEqual(result.get_all(), [(1,), (2,)])
@@ -361,7 +361,7 @@
         self.assertEqual(result.get_one(), (None,))
 
     def test_compile_table_with_schema(self):
-        class Foo(object):
+        class Foo:
             __storm_table__ = "my schema.my table"
             id = Int("my.column", primary=True)
         self.assertEqual(compile(Select(Foo.id)),
@@ -371,7 +371,7 @@
     def test_compile_case(self):
         """The Case expr is compiled in a Postgres' CASE expression."""
         cases = [
-            (Column("foo") > 3, u"big"), (Column("bar") == None, 4)]
+            (Column("foo") > 3, "big"), (Column("bar") == None, 4)]
         state = State()
         statement = compile(Case(cases), state)
         self.assertEqual(
@@ -385,7 +385,7 @@
         If a default is provided, the resulting CASE expression includes
         an ELSE clause.
         """
-        cases = [(Column("foo") > 3, u"big")]
+        cases = [(Column("foo") > 3, "big")]
         state = State()
         statement = compile(Case(cases, default=9), state)
         self.assertEqual(
@@ -398,7 +398,7 @@
         If an expression is provided, the resulting CASE expression uses the
         simple syntax.
         """
-        cases = [(1, u"one"), (2, u"two")]
+        cases = [(1, "one"), (2, "two")]
         state = State()
         statement = compile(Case(cases, expression=Column("foo")), state)
         self.assertEqual(
@@ -554,7 +554,7 @@
 
         result = connection.execute("SHOW TRANSACTION ISOLATION LEVEL")
         # It matches read committed in Postgres internel
-        self.assertEqual(result.get_one()[0], u"read committed")
+        self.assertEqual(result.get_one()[0], "read committed")
 
         connection.execute("INSERT INTO bin_test VALUES (1, 'foo')")
 
@@ -571,7 +571,7 @@
         self.addCleanup(connection.close)
 
         result = connection.execute("SHOW TRANSACTION ISOLATION LEVEL")
-        self.assertEqual(result.get_one()[0], u"read committed")
+        self.assertEqual(result.get_one()[0], "read committed")
 
         connection.execute("INSERT INTO bin_test VALUES (1, 'foo')")
 
@@ -600,7 +600,7 @@
         self.addCleanup(connection.close)
 
         result = connection.execute("SHOW TRANSACTION ISOLATION LEVEL")
-        self.assertEqual(result.get_one()[0], u"serializable")
+        self.assertEqual(result.get_one()[0], "serializable")
 
         # Start a transaction
         result = connection.execute("SELECT 1")
@@ -623,9 +623,9 @@
         import psycopg2
         psycopg2_version = psycopg2.__version__.split(None, 1)[0]
         if psycopg2_version < "2.4.2":
-            self.assertEqual(result.get_one()[0], u"serializable")
+            self.assertEqual(result.get_one()[0], "serializable")
         else:
-            self.assertEqual(result.get_one()[0], u"repeatable read")
+            self.assertEqual(result.get_one()[0], "repeatable read")
 
     def test_unknown_serialization(self):
         self.assertRaises(ValueError, create_database,
@@ -661,8 +661,8 @@
     def test_json_element(self):
         "JSONElement returns an element from a json field."
         connection = self.database.connect()
-        json_value = Cast(u'{"a": 1}', "json")
-        expr = JSONElement(json_value, u"a")
+        json_value = Cast('{"a": 1}', "json")
+        expr = JSONElement(json_value, "a")
         # Need to cast as text since newer psycopg versions decode JSON
         # automatically.
         result = connection.execute(Select(Cast(expr, "text")))
@@ -673,8 +673,8 @@
     def test_json_text_element(self):
         "JSONTextElement returns an element from a json field as text."
         connection = self.database.connect()
-        json_value = Cast(u'{"a": 1}', "json")
-        expr = JSONTextElement(json_value, u"a")
+        json_value = Cast('{"a": 1}', "json")
+        expr = JSONTextElement(json_value, "a")
         result = connection.execute(Select(expr))
         self.assertEqual("1", result.get_one()[0])
         result = connection.execute(Select(Func("pg_typeof", expr)))
@@ -683,7 +683,7 @@
     def test_json_property(self):
         """The JSON property is encoded as JSON"""
 
-        class TestModel(object):
+        class TestModel:
             __storm_table__ = "json_test"
 
             id = Int(primary=True)
@@ -747,7 +747,7 @@
         if uri.host.startswith("/"):
             return create_proxy_and_uri(uri)[0]
         else:
-            return super(PostgresDisconnectionTest, self).create_proxy(uri)
+            return super().create_proxy(uri)
 
     def test_rollback_swallows_InterfaceError(self):
         """Test that InterfaceErrors get caught on rollback().
@@ -765,18 +765,17 @@
             self.fail('Exception should have been swallowed: %s' % repr(exc))
 
 
-class PostgresDisconnectionTestWithoutProxyBase(object):
+class PostgresDisconnectionTestWithoutProxyBase:
     # DatabaseDisconnectionTest uses a socket proxy to simulate broken
     # connections. This class tests some other causes of disconnection.
 
     database_uri = None
 
     def is_supported(self):
-        return bool(self.database_uri) and super(
-            PostgresDisconnectionTestWithoutProxyBase, self).is_supported()
+        return bool(self.database_uri) and super().is_supported()
 
     def setUp(self):
-        super(PostgresDisconnectionTestWithoutProxyBase, self).setUp()
+        super().setUp()
         self.database = create_database(self.database_uri)
 
     def test_terminated_backend(self):
@@ -816,14 +815,14 @@
     database_uri = os.environ.get("STORM_POSTGRES_HOST_URI")
 
     def setUp(self):
-        super(PostgresDisconnectionTestWithoutProxyTCPSockets, self).setUp()
+        super().setUp()
         if self.database.get_uri().host.startswith("/"):
             proxy, proxy_uri = create_proxy_and_uri(self.database.get_uri())
             self.addCleanup(proxy.close)
             self.database = create_database(proxy_uri)
 
 
-class PostgresDisconnectionTestWithPGBouncerBase(object):
+class PostgresDisconnectionTestWithPGBouncerBase:
     # Connecting via pgbouncer <http://pgfoundry.org/projects/pgbouncer>
     # introduces new possible causes of disconnections.
 
@@ -833,7 +832,7 @@
             bool(os.environ.get("STORM_POSTGRES_HOST_URI")))
 
     def setUp(self):
-        super(PostgresDisconnectionTestWithPGBouncerBase, self).setUp()
+        super().setUp()
         database_uri = URI(os.environ["STORM_POSTGRES_HOST_URI"])
         if database_uri.host.startswith("/"):
             proxy, database_uri = create_proxy_and_uri(database_uri)
@@ -889,7 +888,7 @@
         return bool(os.environ.get("STORM_POSTGRES_URI"))
 
     def setUp(self):
-        super(PostgresTimeoutTracerTest, self).setUp()
+        super().setUp()
         self.database = create_database(os.environ["STORM_POSTGRES_URI"])
         self.connection = self.database.connect()
         install_tracer(self.tracer)
@@ -898,7 +897,7 @@
 
     def tearDown(self):
         self.connection.close()
-        super(PostgresTimeoutTracerTest, self).tearDown()
+        super().tearDown()
 
     def test_set_statement_timeout(self):
         result = self.connection.execute("SHOW statement_timeout")
 
=== modified file 'storm/tests/databases/proxy.py'
--- storm/tests/databases/proxy.py	2024-03-04 10:59:55 +0000
+++ storm/tests/databases/proxy.py	2024-03-13 16:26:38 +0000
@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 #
 # Copyright (c) 2006, 2007 Canonical
 #
@@ -59,7 +58,7 @@
                 chunk = os.read(self.request.fileno(), 1024)
                 try:
                     dst.send(chunk)
-                except socket.error as e:
+                except OSError as e:
                     if e.errno == errno.EPIPE:
                         return
                     raise
 
=== modified file 'storm/tests/databases/sqlite.py'
--- storm/tests/databases/sqlite.py	2024-03-04 10:59:55 +0000
+++ storm/tests/databases/sqlite.py	2024-03-13 16:26:38 +0000
@@ -184,9 +184,9 @@
                          [(1,), (2,)])
 
     def test_journal(self):
-        journal_values = {"DELETE": u'delete', "TRUNCATE": u'truncate',
-                          "PERSIST": u'persist', "MEMORY": u'memory',
-                          "WAL": u'wal', "OFF": u'off'}
+        journal_values = {"DELETE": 'delete', "TRUNCATE": 'truncate',
+                          "PERSIST": 'persist', "MEMORY": 'memory',
+                          "WAL": 'wal', "OFF": 'off'}
         for value in journal_values:
             database = SQLite(URI("sqlite:%s?journal_mode=%s" %
                                   (self.get_path(), value)))
@@ -196,9 +196,9 @@
                              journal_values[value])
 
     def test_journal_persistency_to_rollback(self):
-        journal_values = {"DELETE": u'delete', "TRUNCATE": u'truncate',
-                          "PERSIST": u'persist', "MEMORY": u'memory',
-                          "WAL": u'wal', "OFF": u'off'}
+        journal_values = {"DELETE": 'delete', "TRUNCATE": 'truncate',
+                          "PERSIST": 'persist', "MEMORY": 'memory',
+                          "WAL": 'wal', "OFF": 'off'}
         for value in journal_values:
             database = SQLite(URI("sqlite:%s?journal_mode=%s" %
                                   (self.get_path(), value)))
 
=== modified file 'storm/tests/event.py'
--- storm/tests/event.py	2024-03-04 16:31:48 +0000
+++ storm/tests/event.py	2024-03-13 16:26:38 +0000
@@ -22,7 +22,7 @@
 from storm.tests.helper import TestHelper
 
 
-class Marker(object):
+class Marker:
     def __eq__(self, other):
         return self is other
 
 
=== modified file 'storm/tests/expr.py'
--- storm/tests/expr.py	2024-03-04 10:59:55 +0000
+++ storm/tests/expr.py	2024-03-13 16:26:38 +0000
@@ -188,38 +188,38 @@
         expr = Func1()
         self.assertRaises(ExprError, expr.startswith, b"not a unicode string")
 
-        like_expr = expr.startswith(u"abc!!_%")
+        like_expr = expr.startswith("abc!!_%")
         self.assertTrue(isinstance(like_expr, Like))
         self.assertIs(like_expr.expr1, expr)
-        self.assertEqual(like_expr.expr2, u"abc!!!!!_!%%")
-        self.assertEqual(like_expr.escape, u"!")
+        self.assertEqual(like_expr.expr2, "abc!!!!!_!%%")
+        self.assertEqual(like_expr.escape, "!")
 
     def test_startswith_case(self):
         expr = Func1()
-        like_expr = expr.startswith(u"abc!!_%")
+        like_expr = expr.startswith("abc!!_%")
         self.assertIsNone(like_expr.case_sensitive)
-        like_expr = expr.startswith(u"abc!!_%", case_sensitive=True)
+        like_expr = expr.startswith("abc!!_%", case_sensitive=True)
         self.assertIs(True, like_expr.case_sensitive)
-        like_expr = expr.startswith(u"abc!!_%", case_sensitive=False)
+        like_expr = expr.startswith("abc!!_%", case_sensitive=False)
         self.assertIs(False, like_expr.case_sensitive)
 
     def test_endswith(self):
         expr = Func1()
         self.assertRaises(ExprError, expr.startswith, b"not a unicode string")
 
-        like_expr = expr.endswith(u"abc!!_%")
+        like_expr = expr.endswith("abc!!_%")
         self.assertTrue(isinstance(like_expr, Like))
         self.assertIs(like_expr.expr1, expr)
-        self.assertEqual(like_expr.expr2, u"%abc!!!!!_!%")
-        self.assertEqual(like_expr.escape, u"!")
+        self.assertEqual(like_expr.expr2, "%abc!!!!!_!%")
+        self.assertEqual(like_expr.escape, "!")
 
     def test_endswith_case(self):
         expr = Func1()
-        like_expr = expr.endswith(u"abc!!_%")
+        like_expr = expr.endswith("abc!!_%")
         self.assertIsNone(like_expr.case_sensitive)
-        like_expr = expr.endswith(u"abc!!_%", case_sensitive=True)
+        like_expr = expr.endswith("abc!!_%", case_sensitive=True)
         self.assertIs(True, like_expr.case_sensitive)
-        like_expr = expr.endswith(u"abc!!_%", case_sensitive=False)
+        like_expr = expr.endswith("abc!!_%", case_sensitive=False)
         self.assertIs(False, like_expr.case_sensitive)
 
     def test_contains_string(self):
@@ -227,19 +227,19 @@
         self.assertRaises(
             ExprError, expr.contains_string, b"not a unicode string")
 
-        like_expr = expr.contains_string(u"abc!!_%")
+        like_expr = expr.contains_string("abc!!_%")
         self.assertTrue(isinstance(like_expr, Like))
         self.assertIs(like_expr.expr1, expr)
-        self.assertEqual(like_expr.expr2, u"%abc!!!!!_!%%")
-        self.assertEqual(like_expr.escape, u"!")
+        self.assertEqual(like_expr.expr2, "%abc!!!!!_!%%")
+        self.assertEqual(like_expr.escape, "!")
 
     def test_contains_string_case(self):
         expr = Func1()
-        like_expr = expr.contains_string(u"abc!!_%")
+        like_expr = expr.contains_string("abc!!_%")
         self.assertIsNone(like_expr.case_sensitive)
-        like_expr = expr.contains_string(u"abc!!_%", case_sensitive=True)
+        like_expr = expr.contains_string("abc!!_%", case_sensitive=True)
         self.assertIs(True, like_expr.case_sensitive)
-        like_expr = expr.contains_string(u"abc!!_%", case_sensitive=False)
+        like_expr = expr.contains_string("abc!!_%", case_sensitive=False)
         self.assertIs(False, like_expr.case_sensitive)
 
     def test_is(self):
@@ -513,7 +513,7 @@
         self.assertEqual(statement, "func1(None)")
 
     def test_customize_inheritance(self):
-        class C(object): pass
+        class C: pass
         compile_parent = Compile()
         compile_child = compile_parent.create_child()
 
@@ -610,9 +610,9 @@
 
     def test_unicode(self):
         state = State()
-        statement = compile(u"str", state)
+        statement = compile("str", state)
         self.assertEqual(statement, "?")
-        self.assertVariablesEqual(state.parameters, [UnicodeVariable(u"str")])
+        self.assertVariablesEqual(state.parameters, [UnicodeVariable("str")])
 
     def test_int(self):
         state = State()
@@ -812,8 +812,8 @@
         self.assertEqual(state.parameters, [])
 
     def test_select_with_unicode(self):
-        expr = Select(column1, u"1 = 2", table1, order_by=u"column1",
-                      group_by=[u"column2"])
+        expr = Select(column1, "1 = 2", table1, order_by="column1",
+                      group_by=["column2"])
         state = State()
         statement = compile(expr, state)
         self.assertEqual(statement, 'SELECT column1 FROM "table 1" '
@@ -822,8 +822,8 @@
         self.assertEqual(state.parameters, [])
 
     def test_select_having(self):
-        expr = Select(column1, tables=table1, order_by=u"column1",
-                      group_by=[u"column2"], having=u"1 = 2")
+        expr = Select(column1, tables=table1, order_by="column1",
+                      group_by=["column2"], having="1 = 2")
         state = State()
         statement = compile(expr, state)
         self.assertEqual(statement, 'SELECT column1 FROM "table 1" '
@@ -2244,7 +2244,7 @@
         self.assertEqual(py_expr, "b'str'")
 
     def test_unicode(self):
-        py_expr = compile_python(u"str")
+        py_expr = compile_python("str")
         self.assertEqual(py_expr, "'str'")
 
     def test_int(self):
@@ -2483,7 +2483,7 @@
     def test_match_bad_repr(self):
         """The get_matcher() works for expressions containing values
         whose repr is not valid Python syntax."""
-        class BadRepr(object):
+        class BadRepr:
             def __repr__(self):
                 return "$Not a valid Python expression$"
 
 
=== modified file 'storm/tests/helper.py'
--- storm/tests/helper.py	2024-03-04 10:59:55 +0000
+++ storm/tests/helper.py	2024-03-13 16:26:38 +0000
@@ -38,7 +38,7 @@
         return True
 
     def setUp(self):
-        super(TestHelper, self).setUp()
+        super().setUp()
         self._helper_instances = []
         for helper_factory in self.helpers:
             helper = helper_factory()
@@ -48,7 +48,7 @@
     def tearDown(self):
         for helper in reversed(self._helper_instances):
             helper.tear_down(self)
-        super(TestHelper, self).tearDown()
+        super().tearDown()
 
     @property
     def _testMethod(self):
@@ -61,7 +61,7 @@
                 result.startTest(self)
                 result.addSkip(self, "Test not supported")
             return
-        super(TestHelper, self).run(result)
+        super().run(result)
 
     def assertVariablesEqual(self, checked, expected):
         self.assertEqual(len(checked), len(expected))
@@ -70,7 +70,7 @@
             self.assertEqual(check.get(), expect.get())
 
 
-class MakePath(object):
+class MakePath:
 
     def set_up(self, test_case):
         self.dirname = tempfile.mkdtemp()
@@ -101,7 +101,7 @@
         return path
 
 
-class LogKeeper(object):
+class LogKeeper:
     """Record logging information.
 
     Puts a 'logfile' attribute on your test case, which is a StringIO
 
=== modified file 'storm/tests/info.py'
--- storm/tests/info.py	2024-03-04 10:59:55 +0000
+++ storm/tests/info.py	2024-03-13 16:26:38 +0000
@@ -29,7 +29,7 @@
 from storm.tests.helper import TestHelper
 
 
-class Wrapper(object):
+class Wrapper:
 
     def __init__(self, obj):
         self.obj = obj
@@ -42,7 +42,7 @@
 
     def setUp(self):
         TestHelper.setUp(self)
-        class Class(object):
+        class Class:
             __storm_table__ = "table"
             prop1 = Property("column1", primary=True)
         self.Class = Class
@@ -74,7 +74,7 @@
 
     def setUp(self):
         TestHelper.setUp(self)
-        class Class(object):
+        class Class:
             __storm_table__ = "table"
             prop1 = Property("column1", primary=True)
             prop2 = Property("column2")
@@ -82,7 +82,7 @@
         self.cls_info = get_cls_info(Class)
 
     def test_invalid_class(self):
-        class Class(object): pass
+        class Class: pass
         self.assertRaises(ClassInfoError, ClassInfo, Class)
 
     def test_cls(self):
@@ -110,7 +110,7 @@
         self.assertEqual(len(self.cls_info.primary_key), 1)
 
     def test_primary_key_composed(self):
-        class Class(object):
+        class Class:
             __storm_table__ = "table"
             prop1 = Property("column1", primary=2)
             prop2 = Property("column2", primary=1)
@@ -122,7 +122,7 @@
         self.assertEqual(len(cls_info.primary_key), 2)
 
     def test_primary_key_composed_with_attribute(self):
-        class Class(object):
+        class Class:
             __storm_table__ = "table"
             __storm_primary__ = "prop2", "prop1"
             # Define primary=True to ensure that the attribute
@@ -137,21 +137,21 @@
         self.assertEqual(len(cls_info.primary_key), 2)
 
     def test_primary_key_composed_duplicated(self):
-        class Class(object):
+        class Class:
             __storm_table__ = "table"
             prop1 = Property("column1", primary=True)
             prop2 = Property("column2", primary=True)
         self.assertRaises(ClassInfoError, ClassInfo, Class)
 
     def test_primary_key_missing(self):
-        class Class(object):
+        class Class:
             __storm_table__ = "table"
             prop1 = Property("column1")
             prop2 = Property("column2")
         self.assertRaises(ClassInfoError, ClassInfo, Class)
 
     def test_primary_key_attribute_missing(self):
-        class Class(object):
+        class Class:
             __storm_table__ = "table"
             __storm_primary__ = ()
             prop1 = Property("column1", primary=True)
@@ -159,7 +159,7 @@
         self.assertRaises(ClassInfoError, ClassInfo, Class)
 
     def test_primary_key_pos(self):
-        class Class(object):
+        class Class:
             __storm_table__ = "table"
             prop1 = Property("column1", primary=2)
             prop2 = Property("column2")
@@ -172,7 +172,7 @@
 
     def setUp(self):
         TestHelper.setUp(self)
-        class Class(object):
+        class Class:
             __storm_table__ = "table"
             prop1 = Property("column1", primary=True)
             prop2 = Property("column2")
@@ -214,7 +214,7 @@
         args = []
         def validator(obj, attr, value):
             args.append((obj, attr, value))
-        class Class(object):
+        class Class:
             __storm_table__ = "table"
             prop = Property(primary=True,
                             variable_kwargs={"validator": validator})
@@ -522,7 +522,7 @@
 
     def setUp(self):
         TestHelper.setUp(self)
-        class Class(object):
+        class Class:
             __storm_table__ = "table"
             prop1 = Property("column1", primary=True)
         self.Class = Class
@@ -624,10 +624,10 @@
 
     def test_nested_classes(self):
         """Convoluted case checking that the model is right."""
-        class Class1(object):
+        class Class1:
             __storm_table__ = "class1"
             id = Property(primary=True)
-        class Class2(object):
+        class Class2:
             __storm_table__ = Class1
             id = Property(primary=True)
         statement = compile(Class2)
 
=== modified file 'storm/tests/mocker.py'
--- storm/tests/mocker.py	2024-03-04 10:59:55 +0000
+++ storm/tests/mocker.py	2024-03-13 16:26:38 +0000
@@ -35,7 +35,7 @@
 # --------------------------------------------------------------------
 # Helper for chained-style calling.
 
-class expect(object):
+class expect:
     """This is a simple helper that allows a different call-style.
 
     With this class one can comfortably do chaining of calls to the
@@ -136,7 +136,7 @@
         self.__cleanup_funcs = []
         self.__cleanup_paths = []
 
-        super(MockerTestCase, self).__init__(methodName)
+        super().__init__(methodName)
 
     def __cleanup(self):
         for path in self.__cleanup_paths:
@@ -308,13 +308,13 @@
 
     if sys.version_info < (3, 2):
         def assertRaisesRegex(self, *args, **kwargs):
-            return self.assertRaisesRegexp(*args, **kwargs)
+            return self.assertRaisesRegex(*args, **kwargs)
 
 
 # --------------------------------------------------------------------
 # Mocker.
 
-class classinstancemethod(object):
+class classinstancemethod:
 
     def __init__(self, method):
         self.method = method
@@ -752,8 +752,7 @@
         @param sequence: Sequence of values to be generated.
         """
         def generate(*args, **kwargs):
-            for value in sequence:
-                yield value
+            yield from sequence
         self.call(generate)
 
     def throw(self, exception):
@@ -980,7 +979,7 @@
         return self._events[0]
 
 
-class OrderedContext(object):
+class OrderedContext:
 
     def __init__(self, mocker):
         self._mocker = mocker
@@ -1002,7 +1001,7 @@
 # --------------------------------------------------------------------
 # Mock object.
 
-class Mock(object):
+class Mock:
 
     def __init__(self, mocker, path=None, name=None, spec=None, type=None,
                  object=None, passthrough=False, patcher=None, count=True):
@@ -1044,7 +1043,7 @@
 
     def __getattribute__(self, name):
         if name.startswith("__mocker_"):
-            return super(Mock, self).__getattribute__(name)
+            return super().__getattribute__(name)
         if name == "__class__":
             if self.__mocker__.is_recording() or self.__mocker_type__ is None:
                 return type(self)
@@ -1053,7 +1052,7 @@
 
     def __setattr__(self, name, value):
         if name.startswith("__mocker_"):
-            return super(Mock, self).__setattr__(name, value)
+            return super().__setattr__(name, value)
         return self.__mocker_act__("setattr", (name, value))
 
     def __delattr__(self, name):
@@ -1131,7 +1130,7 @@
 # --------------------------------------------------------------------
 # Action and path.
 
-class Action(object):
+class Action:
 
     def __init__(self, kind, args, kwargs, path=None):
         self.kind = kind
@@ -1200,7 +1199,7 @@
         return result
 
 
-class Path(object):
+class Path:
 
     def __init__(self, root_mock, root_object=None, actions=()):
         self.root_mock = root_mock
@@ -1293,7 +1292,7 @@
         return result
 
 
-class SpecialArgument(object):
+class SpecialArgument:
     """Base for special arguments for matching parameters."""
 
     def __init__(self, object=None):
@@ -1450,7 +1449,7 @@
 # --------------------------------------------------------------------
 # Event and task base.
 
-class Event(object):
+class Event:
     """Aggregation of tasks that keep track of a recorded action.
 
     An event represents something that may or may not happen while the
@@ -1591,7 +1590,7 @@
         return False
 
 
-class Task(object):
+class Task:
     """Element used to track one specific aspect on an event.
 
     A task is responsible for adding any kind of logic to an event.
@@ -1918,7 +1917,7 @@
                     referrer[key] = install
 
 
-class Undefined(object):
+class Undefined:
 
     def __repr__(self):
         return "Undefined"
@@ -1929,7 +1928,7 @@
 class Patcher(Task):
 
     def __init__(self):
-        super(Patcher, self).__init__()
+        super().__init__()
         self._monitored = {} # {kind: {id(object): object}}
         self._patched = {}
 
@@ -1941,7 +1940,7 @@
             cls = type(obj)
             if issubclass(cls, type):
                 cls = obj
-            bases = set([id(base) for base in cls.__mro__])
+            bases = {id(base) for base in cls.__mro__}
             bases.intersection_update(monitored)
             return bool(bases)
         return False
@@ -2026,7 +2025,7 @@
             raise
 
 
-class PatchedMethod(object):
+class PatchedMethod:
 
     def __init__(self, kind, unpatched, is_monitoring):
         self._kind = kind
 
=== modified file 'storm/tests/properties.py'
--- storm/tests/properties.py	2024-03-04 10:59:55 +0000
+++ storm/tests/properties.py	2024-03-13 16:26:38 +0000
@@ -45,7 +45,7 @@
 
     def setUp(self):
         TestHelper.setUp(self)
-        class Class(object):
+        class Class:
             __storm_table__ = "mytable"
             prop1 = Custom("column1", primary=True)
             prop2 = Custom()
@@ -108,10 +108,10 @@
     def test_variable_factory_validator_attribute(self):
         # Should work even if we make things harder by reusing properties.
         prop = Custom()
-        class Class1(object):
+        class Class1:
             __storm_table__ = "table1"
             prop1 = prop
-        class Class2(object):
+        class Class2:
             __storm_table__ = "table2"
             prop2 = prop
         args = []
@@ -152,7 +152,7 @@
             args[:] = obj, attr, value
             return 42
 
-        class Class(object):
+        class Class:
             __storm_table__ = "mytable"
             prop = Custom("column", primary=True, validator=validator)
 
@@ -299,10 +299,10 @@
         right now it works, and we should try not to break it.
         """
         prop = Custom()
-        class Class1(object):
+        class Class1:
             __storm_table__ = "table1"
             prop1 = prop
-        class Class2(object):
+        class Class2:
             __storm_table__ = "table2"
             prop2 = prop
         self.assertEqual(Class1.prop1.name, "prop1")
@@ -316,7 +316,7 @@
     def setup(self, property, *args, **kwargs):
         prop2_kwargs = kwargs.pop("prop2_kwargs", {})
         kwargs["primary"] = True
-        class Class(object):
+        class Class:
             __storm_table__ = "mytable"
             prop1 = property("column1", *args, **kwargs)
             prop2 = property(**prop2_kwargs)
@@ -432,10 +432,10 @@
         self.obj.prop2 = None
         self.assertEqual(self.obj.prop2, None)
 
-        self.assertRaises(TypeError, setattr, self.obj, "prop1", u"unicode")
+        self.assertRaises(TypeError, setattr, self.obj, "prop1", "unicode")
 
     def test_unicode(self):
-        self.setup(Unicode, default=u"def", allow_none=False)
+        self.setup(Unicode, default="def", allow_none=False)
 
         self.assertTrue(isinstance(self.column1, Column))
         self.assertTrue(isinstance(self.column2, Column))
@@ -446,7 +446,7 @@
         self.assertTrue(isinstance(self.variable1, UnicodeVariable))
         self.assertTrue(isinstance(self.variable2, UnicodeVariable))
 
-        self.assertEqual(self.obj.prop1, u"def")
+        self.assertEqual(self.obj.prop1, "def")
         self.assertRaises(NoneError, setattr, self.obj, "prop1", None)
         self.obj.prop2 = None
         self.assertEqual(self.obj.prop2, None)
@@ -798,7 +798,7 @@
         self.assertEqual(changes, [(self.variable1, None, ["a"], False)])
 
     def test_variable_factory_arguments(self):
-        class Class(object):
+        class Class:
             __storm_table__ = "test"
             id = Int(primary=True)
 
@@ -812,7 +812,7 @@
                                (Int, IntVariable, 1),
                                (Float, FloatVariable, 1.1),
                                (Bytes, BytesVariable, b"str"),
-                               (Unicode, UnicodeVariable, u"unicode"),
+                               (Unicode, UnicodeVariable, "unicode"),
                                (DateTime, DateTimeVariable, datetime.now()),
                                (Date, DateVariable, date.today()),
                                (Time, TimeVariable, datetime.now().time()),
@@ -881,7 +881,7 @@
     def setUp(self):
         TestHelper.setUp(self)
 
-        class Class(object):
+        class Class:
             __storm_table__ = "mytable"
             prop1 = Property("column1", primary=True)
             prop2 = Property()
 
=== modified file 'storm/tests/schema/patch.py'
--- storm/tests/schema/patch.py	2024-03-04 10:59:55 +0000
+++ storm/tests/schema/patch.py	2024-03-13 16:26:38 +0000
@@ -75,7 +75,7 @@
 """
 
 
-class MockPatchStore(object):
+class MockPatchStore:
 
     def __init__(self, database, patches=[]):
         self.database = database
@@ -103,7 +103,7 @@
 class PatchApplierTest(MockerTestCase):
 
     def setUp(self):
-        super(PatchApplierTest, self).setUp()
+        super().setUp()
 
         self.patchdir = self.makeDir()
         self.pkgdir = os.path.join(self.patchdir, "mypackage")
@@ -143,7 +143,7 @@
         self.another_store.commit()
         self.prepare_for_transaction_check()
 
-        class Committer(object):
+        class Committer:
 
             def commit(committer):
                 self.store.commit()
@@ -158,7 +158,7 @@
                                           self.committer)
 
     def tearDown(self):
-        super(PatchApplierTest, self).tearDown()
+        super().tearDown()
         self.committer.rollback()
         sys.path.remove(self.patchdir)
         for name in list(sys.modules):
@@ -329,7 +329,7 @@
         patches = [Patch(42), Patch(380), Patch(381)]
         my_store = MockPatchStore("database", patches=patches)
         patch_applier = PatchApplier(my_store, self.mypackage)
-        self.assertEqual(set([381]),
+        self.assertEqual({381},
                          patch_applier.get_unknown_patch_versions())
 
     def test_no_unknown_patch_versions(self):
@@ -410,7 +410,7 @@
 class PatchSetTest(MockerTestCase):
 
     def setUp(self):
-        super(PatchSetTest, self).setUp()
+        super().setUp()
         self.sys_dir = self.makeDir()
         self.package_dir = os.path.join(self.sys_dir, "mypackage")
         os.makedirs(self.package_dir)
@@ -423,7 +423,7 @@
         self.patch_package = PatchSet(mypackage, sub_level="foo")
 
     def tearDown(self):
-        super(PatchSetTest, self).tearDown()
+        super().tearDown()
         for name in list(sys.modules):
             if name == "mypackage" or name.startswith("mypackage."):
                 del sys.modules[name]
 
=== modified file 'storm/tests/schema/schema.py'
--- storm/tests/schema/schema.py	2024-03-04 10:59:55 +0000
+++ storm/tests/schema/schema.py	2024-03-13 16:26:38 +0000
@@ -27,7 +27,7 @@
 from storm.tests.mocker import MockerTestCase
 
 
-class Package(object):
+class Package:
 
     def __init__(self, package_dir, name):
         self.name = name
@@ -43,7 +43,7 @@
 class SchemaTest(MockerTestCase):
 
     def setUp(self):
-        super(SchemaTest, self).setUp()
+        super().setUp()
         self.database = create_database("sqlite:///%s" % self.makeFile())
         self.store = Store(self.database)
 
@@ -68,7 +68,7 @@
             elif any(name.startswith("%s." % x) for x in self._package_names):
                 del sys.modules[name]
 
-        super(SchemaTest, self).tearDown()
+        super().tearDown()
 
     def create_package(self, base_dir, name, init_module=None):
         """Create a Python package.
@@ -169,7 +169,7 @@
         self.schema.create(self.store)
         self.store.execute("INSERT INTO person (id, name) VALUES (1, 'Jane')")
         self.assertEqual(list(self.store.execute("SELECT * FROM person")),
-                         [(1, u"Jane")])
+                         [(1, "Jane")])
         self.schema.delete(self.store)
         self.assertEqual(list(self.store.execute("SELECT * FROM person")), [])
 
@@ -214,7 +214,7 @@
         self.store.execute(
             "INSERT INTO person (id, name, phone) VALUES (1, 'Jane', '123')")
         self.assertEqual(list(self.store.execute("SELECT * FROM person")),
-                         [(1, u"Jane", u"123")])
+                         [(1, "Jane", "123")])
 
     def test_advance(self):
         """
@@ -235,4 +235,4 @@
         self.store.execute(
             "INSERT INTO person (id, name, phone) VALUES (1, 'Jane', '123')")
         self.assertEqual(list(self.store.execute("SELECT * FROM person")),
-                         [(1, u"Jane", u"123")])
+                         [(1, "Jane", "123")])
 
=== modified file 'storm/tests/schema/sharding.py'
--- storm/tests/schema/sharding.py	2024-03-04 10:59:55 +0000
+++ storm/tests/schema/sharding.py	2024-03-13 16:26:38 +0000
@@ -23,7 +23,7 @@
 from storm.tests.mocker import MockerTestCase
 
 
-class FakeSchema(object):
+class FakeSchema:
 
     patches = 2
 
@@ -50,7 +50,7 @@
         self.applied.append((store, store.patch))
 
 
-class FakeStore(object):
+class FakeStore:
 
     pristine = True  # If no schema was ever applied
     patch = 0  # Current patch level of the store
@@ -59,7 +59,7 @@
 class ShardingTest(MockerTestCase):
 
     def setUp(self):
-        super(ShardingTest, self).setUp()
+        super().setUp()
         self.store = FakeStore()
         self.schema = FakeSchema()
         self.sharding = Sharding()
 
=== modified file 'storm/tests/sqlobject.py'
--- storm/tests/sqlobject.py	2024-03-04 10:59:55 +0000
+++ storm/tests/sqlobject.py	2024-03-13 16:26:38 +0000
@@ -343,7 +343,7 @@
         self.assertEqual(nobody, None)
 
         # SQLBuilder style expression:
-        person = self.Person.selectFirst(LIKE(self.Person.q.name, u"John%"),
+        person = self.Person.selectFirst(LIKE(self.Person.q.name, "John%"),
                                          orderBy="name")
         self.assertNotEqual(person, None)
         self.assertEqual(person.name, "John Doe")
@@ -463,8 +463,8 @@
         class Person(self.SQLObject):
             name = StringCol(storm_validator=validator)
         person = Person.get(2)
-        person.name = u'foo'
-        self.assertEqual(calls, [(person, 'name', u'foo')])
+        person.name = 'foo'
+        self.assertEqual(calls, [(person, 'name', 'foo')])
 
     def test_string_col(self):
         class Person(self.SQLObject):
@@ -1200,21 +1200,21 @@
         class Person(self.Person):
             def set(self, **kw):
                 kw["id"] += 1
-                super(Person, self).set(**kw)
+                super().set(**kw)
         person = Person(id=3, name="John Moe")
         self.assertEqual(person.id, 4)
         self.assertEqual(person.name, "John Moe")
 
     def test_CONTAINSSTRING(self):
-        expr = CONTAINSSTRING(self.Person.q.name, u"Do")
-        result = self.Person.select(expr)
-        self.assertEqual([person.name for person in result],
-                         [u"John Doe"])
-
-        result[0].name = u"Funny !%_ Name"
-
-        expr = NOT(CONTAINSSTRING(self.Person.q.name, u"!%_"))
-        result = self.Person.select(expr)
-        self.assertEqual([person.name for person in result],
-                         [u"John Joe"])
+        expr = CONTAINSSTRING(self.Person.q.name, "Do")
+        result = self.Person.select(expr)
+        self.assertEqual([person.name for person in result],
+                         ["John Doe"])
+
+        result[0].name = "Funny !%_ Name"
+
+        expr = NOT(CONTAINSSTRING(self.Person.q.name, "!%_"))
+        result = self.Person.select(expr)
+        self.assertEqual([person.name for person in result],
+                         ["John Joe"])
 
 
=== modified file 'storm/tests/store/base.py'
--- storm/tests/store/base.py	2024-03-04 10:59:55 +0000
+++ storm/tests/store/base.py	2024-03-13 16:26:38 +0000
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 #
 # Copyright (c) 2006, 2007 Canonical
 #
@@ -49,36 +48,36 @@
 from storm.tests.helper import TestHelper
 
 
-class Foo(object):
+class Foo:
     __storm_table__ = "foo"
     id = Int(primary=True)
     title = Unicode()
 
-class Bar(object):
+class Bar:
     __storm_table__ = "bar"
     id = Int(primary=True)
     title = Unicode()
     foo_id = Int()
     foo = Reference(foo_id, Foo.id)
 
-class UniqueID(object):
+class UniqueID:
     __storm_table__ = "unique_id"
     id = UUID(primary=True)
     def __init__(self, id):
         self.id = id
 
-class Blob(object):
+class Blob:
     __storm_table__ = "bin"
     id = Int(primary=True)
     bin = Bytes()
 
-class Link(object):
+class Link:
     __storm_table__ = "link"
     __storm_primary__ = "foo_id", "bar_id"
     foo_id = Int()
     bar_id = Int()
 
-class SelfRef(object):
+class SelfRef:
     __storm_table__ = "selfref"
     id = Int(primary=True)
     title = Unicode()
@@ -110,14 +109,14 @@
                         order_by=Bar.title)
 
 
-class FooValue(object):
+class FooValue:
     __storm_table__ = "foovalue"
     id = Int(primary=True)
     foo_id = Int()
     value1 = Int()
     value2 = Int()
 
-class BarProxy(object):
+class BarProxy:
     __storm_table__ = "bar"
     id = Int(primary=True)
     title = Unicode()
@@ -125,7 +124,7 @@
     foo = Reference(foo_id, Foo.id)
     foo_title = Proxy(foo, Foo.title)
 
-class Money(object):
+class Money:
     __storm_table__ = "money"
     id = Int(primary=True)
     value = Decimal()
@@ -134,17 +133,17 @@
 class DecorateVariable(Variable):
 
     def parse_get(self, value, to_db):
-        return u"to_%s(%s)" % (to_db and "db" or "py", value)
+        return "to_%s(%s)" % (to_db and "db" or "py", value)
 
     def parse_set(self, value, from_db):
-        return u"from_%s(%s)" % (from_db and "db" or "py", value)
+        return "from_%s(%s)" % (from_db and "db" or "py", value)
 
 
 class FooVariable(Foo):
     title = Property(variable_class=DecorateVariable)
 
 
-class DummyDatabase(object):
+class DummyDatabase:
 
     def connect(self, event=None):
         return None
@@ -170,7 +169,7 @@
         self.assertIdentical(store.get_database(), database)
 
 
-class StoreTest(object):
+class StoreTest:
 
     def setUp(self):
         self.store = None
@@ -307,7 +306,7 @@
 
     def test_execute_flushes(self):
         foo = self.store.get(Foo, 10)
-        foo.title = u"New Title"
+        foo.title = "New Title"
 
         result = self.store.execute("SELECT title FROM foo WHERE id=10")
         self.assertEqual(result.get_one(), ("New Title",))
@@ -373,13 +372,13 @@
         # After adding an object, no references should be needed in
         # python for it still to be added to the database.
         foo = Foo()
-        foo.title = u"live"
+        foo.title = "live"
         self.store.add(foo)
 
         del foo
         gc.collect()
 
-        self.assertTrue(self.store.find(Foo, title=u"live").one())
+        self.assertTrue(self.store.find(Foo, title="live").one())
 
     def test_obj_info_with_deleted_object(self):
         # Let's try to put Storm in trouble by killing the object
@@ -524,14 +523,14 @@
         store.
         """
         foo = self.store.get(Foo, 20)
-        foo.title = u"changed"
+        foo.title = "changed"
         self.store.block_implicit_flushes()
         foo2 = self.store.find(Foo, Foo.id == 20).one()
         self.store.unblock_implicit_flushes()
         self.store.commit()
 
         foo3 = self.store.find(Foo, Foo.id == 20).one()
-        self.assertEqual(foo3.title, u"changed")
+        self.assertEqual(foo3.title, "changed")
 
     def test_obj_info_with_deleted_object_with_get(self):
         # Same thing, but using get rather than find.
@@ -559,7 +558,7 @@
         self.get_cache(self.store).set_size(0)
 
         foo = self.store.get(Foo, 20)
-        foo.title = u"Changed"
+        foo.title = "Changed"
         foo.tainted = True
         obj_info = get_obj_info(foo)
 
@@ -571,11 +570,11 @@
     def test_get_tuple(self):
         class MyFoo(Foo):
             __storm_primary__ = "title", "id"
-        foo = self.store.get(MyFoo, (u"Title 30", 10))
+        foo = self.store.get(MyFoo, ("Title 30", 10))
         self.assertEqual(foo.id, 10)
         self.assertEqual(foo.title, "Title 30")
 
-        foo = self.store.get(MyFoo, (u"Title 20", 10))
+        foo = self.store.get(MyFoo, ("Title 20", 10))
         self.assertEqual(foo, None)
 
     def test_of(self):
@@ -635,13 +634,13 @@
 
     def test_find_expr(self):
         result = self.store.find(Foo, Foo.id == 20,
-                                 Foo.title == u"Title 20")
+                                 Foo.title == "Title 20")
         self.assertEqual([(foo.id, foo.title) for foo in result], [
                           (20, "Title 20"),
                          ])
 
         result = self.store.find(Foo, Foo.id == 10,
-                                 Foo.title == u"Title 20")
+                                 Foo.title == "Title 20")
         self.assertEqual([(foo.id, foo.title) for foo in result], [
                          ])
 
@@ -654,12 +653,12 @@
         self.assertEqual(foo.title, "Title 20")
 
     def test_find_keywords(self):
-        result = self.store.find(Foo, id=20, title=u"Title 20")
+        result = self.store.find(Foo, id=20, title="Title 20")
         self.assertEqual([(foo.id, foo.title) for foo in result], [
-                          (20, u"Title 20")
+                          (20, "Title 20")
                          ])
 
-        result = self.store.find(Foo, id=10, title=u"Title 20")
+        result = self.store.find(Foo, id=10, title="Title 20")
         self.assertEqual([(foo.id, foo.title) for foo in result], [
                          ])
 
@@ -1053,7 +1052,7 @@
         self.assertTrue(isinstance(title, str))
 
     def test_find_max_with_empty_result_and_disallow_none(self):
-        class Bar(object):
+        class Bar:
             __storm_table__ = "bar"
             id = Int(primary=True)
             foo_id = Int(allow_none=False)
@@ -1074,7 +1073,7 @@
         self.assertTrue(isinstance(title, str))
 
     def test_find_min_with_empty_result_and_disallow_none(self):
-        class Bar(object):
+        class Bar:
             __storm_table__ = "bar"
             id = Int(primary=True)
             foo_id = Int(allow_none=False)
@@ -1092,7 +1091,7 @@
     def test_find_avg_float(self):
         foo = Foo()
         foo.id = 15
-        foo.title = u"Title 15"
+        foo.title = "Title 15"
         self.store.add(foo)
         self.assertEqual(self.store.find(Foo).avg(Foo.id), 18.75)
 
@@ -1103,7 +1102,7 @@
         self.assertEqual(self.store.find(Foo).sum(Foo.id * 2), 120)
 
     def test_find_sum_with_empty_result_and_disallow_none(self):
-        class Bar(object):
+        class Bar:
             __storm_table__ = "bar"
             id = Int(primary=True)
             foo_id = Int(allow_none=False)
@@ -1203,7 +1202,7 @@
         self.assertTrue(foo1)
         self.assertTrue(foo2)
         self.assertTrue(bar)
-        self.assertEqual(self.store.find(Foo, title=u"Title 20").cached(),
+        self.assertEqual(self.store.find(Foo, title="Title 20").cached(),
                          [foo2])
 
     def test_find_cached_invalidated(self):
@@ -1217,7 +1216,7 @@
         self.store.invalidate(foo)
         # Do not look for the primary key (id), since it's able to get
         # it without touching the database. Use the title instead.
-        self.assertEqual(self.store.find(Foo, title=u"Title 20").cached(), [])
+        self.assertEqual(self.store.find(Foo, title="Title 20").cached(), [])
 
     def test_find_cached_with_info_alive_and_object_dead(self):
         # Disable the cache, which holds strong references.
@@ -1242,8 +1241,8 @@
         lst = [bar and (bar.id, bar.title) for bar in result]
         self.assertEqual(lst, [
                           None,
-                          (200, u"Title 200"),
-                          (300, u"Title 100"),
+                          (200, "Title 200"),
+                          (300, "Title 100"),
                          ])
 
     def test_using_find_with_strings(self):
@@ -1263,8 +1262,8 @@
         lst = [bar and (bar.id, bar.title) for bar in result]
         self.assertEqual(lst, [
                           None,
-                          (200, u"Title 200"),
-                          (300, u"Title 100"),
+                          (200, "Title 200"),
+                          (300, "Title 100"),
                          ])
 
     def test_find_tuple(self):
@@ -1276,8 +1275,8 @@
         lst = [(foo and (foo.id, foo.title), bar and (bar.id, bar.title))
                for (foo, bar) in result]
         self.assertEqual(lst, [
-                          ((10, u"Title 30"), (100, u"Title 300")),
-                          ((30, u"Title 10"), (300, u"Title 100")),
+                          ((10, "Title 30"), (100, "Title 300")),
+                          ((30, "Title 10"), (300, "Title 100")),
                          ])
 
     def test_find_tuple_using(self):
@@ -1289,13 +1288,13 @@
         lst = [(foo and (foo.id, foo.title), bar and (bar.id, bar.title))
                for (foo, bar) in result]
         self.assertEqual(lst, [
-                          ((10, u"Title 30"), (100, u"Title 300")),
-                          ((20, u"Title 20"), None),
-                          ((30, u"Title 10"), (300, u"Title 100")),
+                          ((10, "Title 30"), (100, "Title 300")),
+                          ((20, "Title 20"), None),
+                          ((30, "Title 10"), (300, "Title 100")),
                          ])
 
     def test_find_tuple_using_with_disallow_none(self):
-        class Bar(object):
+        class Bar:
             __storm_table__ = "bar"
             id = Int(primary=True, allow_none=False)
             title = Unicode()
@@ -1310,9 +1309,9 @@
         lst = [(foo and (foo.id, foo.title), bar and (bar.id, bar.title))
                for (foo, bar) in result]
         self.assertEqual(lst, [
-                          ((10, u"Title 30"), (100, u"Title 300")),
-                          ((20, u"Title 20"), None),
-                          ((30, u"Title 10"), (300, u"Title 100")),
+                          ((10, "Title 30"), (100, "Title 300")),
+                          ((20, "Title 20"), None),
+                          ((30, "Title 10"), (300, "Title 100")),
                          ])
 
     def test_find_tuple_using_skip_when_none(self):
@@ -1327,11 +1326,11 @@
                 link and (link.bar_id, link.foo_id))
                for (bar, link) in result]
         self.assertEqual(lst, [
-                          ((100, u"Title 300"), (100, 10)),
-                          ((100, u"Title 300"), (100, 20)),
+                          ((100, "Title 300"), (100, 10)),
+                          ((100, "Title 300"), (100, 20)),
                           (None, None),
-                          ((300, u"Title 100"), (300, 10)),
-                          ((300, u"Title 100"), (300, 30)),
+                          ((300, "Title 100"), (300, 10)),
+                          ((300, "Title 100"), (300, 30)),
                          ])
 
     def test_find_tuple_contains(self):
@@ -1362,9 +1361,9 @@
         result = self.store.find((Foo, Bar), Bar.foo_id == Foo.id)
         foo, bar = result.order_by(Foo.id).any()
         self.assertEqual(foo.id, 10)
-        self.assertEqual(foo.title, u"Title 30")
+        self.assertEqual(foo.title, "Title 30")
         self.assertEqual(bar.id, 100)
-        self.assertEqual(bar.title, u"Title 300")
+        self.assertEqual(bar.title, "Title 300")
 
     def test_find_tuple_first(self):
         bar = self.store.get(Bar, 200)
@@ -1373,9 +1372,9 @@
         result = self.store.find((Foo, Bar), Bar.foo_id == Foo.id)
         foo, bar = result.order_by(Foo.id).first()
         self.assertEqual(foo.id, 10)
-        self.assertEqual(foo.title, u"Title 30")
+        self.assertEqual(foo.title, "Title 30")
         self.assertEqual(bar.id, 100)
-        self.assertEqual(bar.title, u"Title 300")
+        self.assertEqual(bar.title, "Title 300")
 
     def test_find_tuple_last(self):
         bar = self.store.get(Bar, 200)
@@ -1384,9 +1383,9 @@
         result = self.store.find((Foo, Bar), Bar.foo_id == Foo.id)
         foo, bar = result.order_by(Foo.id).last()
         self.assertEqual(foo.id, 30)
-        self.assertEqual(foo.title, u"Title 10")
+        self.assertEqual(foo.title, "Title 10")
         self.assertEqual(bar.id, 300)
-        self.assertEqual(bar.title, u"Title 100")
+        self.assertEqual(bar.title, "Title 100")
 
     def test_find_tuple_one(self):
         bar = self.store.get(Bar, 200)
@@ -1396,9 +1395,9 @@
                                  Bar.foo_id == Foo.id, Foo.id == 10)
         foo, bar = result.order_by(Foo.id).one()
         self.assertEqual(foo.id, 10)
-        self.assertEqual(foo.title, u"Title 30")
+        self.assertEqual(foo.title, "Title 30")
         self.assertEqual(bar.id, 100)
-        self.assertEqual(bar.title, u"Title 300")
+        self.assertEqual(bar.title, "Title 300")
 
     def test_find_tuple_count(self):
         bar = self.store.get(Bar, 200)
@@ -1412,11 +1411,11 @@
 
     def test_find_tuple_set(self):
         result = self.store.find((Foo, Bar))
-        self.assertRaises(FeatureError, result.set, title=u"Title 40")
+        self.assertRaises(FeatureError, result.set, title="Title 40")
 
     def test_find_tuple_kwargs(self):
         self.assertRaises(FeatureError,
-                          self.store.find, (Foo, Bar), title=u"Title 10")
+                          self.store.find, (Foo, Bar), title="Title 10")
 
     def test_find_tuple_cached(self):
         result = self.store.find((Foo, Bar))
@@ -1429,12 +1428,12 @@
     def test_find_with_expr(self):
         result = self.store.find(Foo.title)
         self.assertEqual(sorted(result),
-                         [u"Title 10", u"Title 20", u"Title 30"])
+                         ["Title 10", "Title 20", "Title 30"])
 
     def test_find_with_expr_uses_variable_set(self):
         result = self.store.find(FooVariable.title,
                                  FooVariable.id == 10)
-        self.assertEqual(list(result), [u"to_py(from_db(Title 30))"])
+        self.assertEqual(list(result), ["to_py(from_db(Title 30))"])
 
     def test_find_tuple_with_expr(self):
         result = self.store.find((Foo, Bar.id, Bar.title),
@@ -1442,36 +1441,36 @@
         result.order_by(Foo.id)
         self.assertEqual([(foo.id, foo.title, bar_id, bar_title)
                           for foo, bar_id, bar_title in result],
-                          [(10, u"Title 30", 100, u"Title 300"),
-                           (20, u"Title 20", 200, u"Title 200"),
-                           (30, u"Title 10", 300, u"Title 100")])
+                          [(10, "Title 30", 100, "Title 300"),
+                           (20, "Title 20", 200, "Title 200"),
+                           (30, "Title 10", 300, "Title 100")])
 
     def test_find_using_with_expr(self):
         result = self.store.using(Foo).find(Foo.title)
         self.assertEqual(sorted(result),
-                         [u"Title 10", u"Title 20", u"Title 30"])
+                         ["Title 10", "Title 20", "Title 30"])
 
     def test_find_with_expr_contains(self):
         result = self.store.find(Foo.title)
-        self.assertEqual(u"Title 10" in result, True)
-        self.assertEqual(u"Title 42" in result, False)
+        self.assertEqual("Title 10" in result, True)
+        self.assertEqual("Title 42" in result, False)
 
     def test_find_tuple_with_expr_contains(self):
         foo = self.store.get(Foo, 10)
         result = self.store.find((Foo, Bar.title),
                                  Bar.foo_id == Foo.id)
-        self.assertEqual((foo, u"Title 300") in result, True)
-        self.assertEqual((foo, u"Title 100") in result, False)
+        self.assertEqual((foo, "Title 300") in result, True)
+        self.assertEqual((foo, "Title 100") in result, False)
 
     def test_find_with_expr_contains_with_set_expression(self):
         result1 = self.store.find(Foo.title)
         result2 = self.store.find(Foo.title)
-        self.assertEqual(u"Title 10" in result1.union(result2), True)
+        self.assertEqual("Title 10" in result1.union(result2), True)
 
         if self.__class__.__name__.startswith("MySQL"):
             return
-        self.assertEqual(u"Title 10" in result1.intersection(result2), True)
-        self.assertEqual(u"Title 10" in result1.difference(result2), False)
+        self.assertEqual("Title 10" in result1.intersection(result2), True)
+        self.assertEqual("Title 10" in result1.difference(result2), False)
 
     def test_find_with_expr_remove_unsupported(self):
         result = self.store.find(Foo.title)
@@ -1492,12 +1491,12 @@
     def test_find_with_expr_values(self):
         result = self.store.find(Foo.title)
         self.assertEqual(sorted(result.values(Foo.title)),
-                         [u"Title 10", u"Title 20", u"Title 30"])
+                         ["Title 10", "Title 20", "Title 30"])
 
     def test_find_tuple_with_expr_values(self):
         result = self.store.find((Foo, Bar.title), Bar.foo_id == Foo.id)
         self.assertEqual(sorted(result.values(Foo.title)),
-                         [u"Title 10", u"Title 20", u"Title 30"])
+                         ["Title 10", "Title 20", "Title 30"])
 
     def test_find_with_expr_set_unsupported(self):
         result = self.store.find(Foo.title)
@@ -1520,7 +1519,7 @@
         result2 = self.store.find(Foo.title, Foo.id != 10)
         result = result1.union(result2)
         self.assertEqual(sorted(result),
-                         [u"Title 10", u"Title 20", u"Title 30",])
+                         ["Title 10", "Title 20", "Title 30",])
 
     def test_find_with_expr_union_mismatch(self):
         result1 = self.store.find(Foo.title)
@@ -1529,19 +1528,19 @@
 
     def test_find_tuple_with_expr_union(self):
         result1 = self.store.find(
-            (Foo, Bar.title), Bar.foo_id == Foo.id, Bar.title == u"Title 100")
+            (Foo, Bar.title), Bar.foo_id == Foo.id, Bar.title == "Title 100")
         result2 = self.store.find(
-            (Foo, Bar.title), Bar.foo_id == Foo.id, Bar.title == u"Title 200")
+            (Foo, Bar.title), Bar.foo_id == Foo.id, Bar.title == "Title 200")
         result = result1.union(result2)
         self.assertEqual(sorted((foo.id, title) for (foo, title) in result),
-                         [(20, u"Title 200"), (30, u"Title 100")])
+                         [(20, "Title 200"), (30, "Title 100")])
 
     def test_get_does_not_validate(self):
         def validator(object, attr, value):
             self.fail("validator called with arguments (%r, %r, %r)" %
                       (object, attr, value))
 
-        class Foo(object):
+        class Foo:
             __storm_table__ = "foo"
             id = Int(primary=True)
             title = Unicode(validator=validator)
@@ -1554,10 +1553,10 @@
             self.fail("validator called with arguments (%r, %r, %r)" %
                       (object, attr, value))
 
-        class Foo(object):
+        class Foo:
             __storm_table__ = "foo"
             id = Int(primary=True)
-            title = Unicode(validator=validator, default=u"default value")
+            title = Unicode(validator=validator, default="default value")
 
         foo = self.store.get(Foo, 10)
         self.assertEqual(foo.title, "Title 30")
@@ -1567,7 +1566,7 @@
             self.fail("validator called with arguments (%r, %r, %r)" %
                       (object, attr, value))
 
-        class Foo(object):
+        class Foo:
             __storm_table__ = "foo"
             id = Int(primary=True)
             title = Unicode(validator=validator)
@@ -1682,7 +1681,7 @@
         result.group_by(Foo)
         result.order_by(Foo.title)
         result = list(result.values(Foo.title))
-        self.assertEqual(result, [u'Title 20', u'Title 30'])
+        self.assertEqual(result, ['Title 20', 'Title 30'])
 
     def test_find_group_by_union(self):
         result1 = self.store.find(Foo, id=30)
@@ -1703,7 +1702,7 @@
     def test_add_commit(self):
         foo = Foo()
         foo.id = 40
-        foo.title = u"Title 40"
+        foo.title = "Title 40"
 
         self.store.add(foo)
 
@@ -1725,7 +1724,7 @@
     def test_add_rollback_commit(self):
         foo = Foo()
         foo.id = 40
-        foo.title = u"Title 40"
+        foo.title = "Title 40"
 
         self.store.add(foo)
         self.store.rollback()
@@ -1749,7 +1748,7 @@
     def test_add_get(self):
         foo = Foo()
         foo.id = 40
-        foo.title = u"Title 40"
+        foo.title = "Title 40"
 
         self.store.add(foo)
 
@@ -1765,7 +1764,7 @@
     def test_add_find(self):
         foo = Foo()
         foo.id = 40
-        foo.title = u"Title 40"
+        foo.title = "Title 40"
 
         self.store.add(foo)
 
@@ -1799,7 +1798,7 @@
         self.store.add(bar)
 
         bar.id = 400
-        bar.title = u"Title 400"
+        bar.title = "Title 400"
         bar.foo_id = 40
 
         self.store.flush()
@@ -1817,7 +1816,7 @@
         self.store.add(foo)
         self.store.flush()
         self.assertEqual(type(foo.id), int)
-        self.assertEqual(foo.title, u"Default Title")
+        self.assertEqual(foo.title, "Default Title")
 
     def test_add_uuid(self):
         unique_id = self.store.add(UniqueID(uuid4()))
@@ -1854,7 +1853,7 @@
         self.store.remove(foo)
         self.store.rollback()
 
-        foo.title = u"Title 200"
+        foo.title = "Title 200"
 
         self.store.flush()
 
@@ -1871,7 +1870,7 @@
         self.store.flush()
         self.store.rollback()
 
-        foo.title = u"Title 200"
+        foo.title = "Title 200"
 
         self.store.flush()
 
@@ -1887,7 +1886,7 @@
         self.store.remove(foo)
         self.store.add(foo)
 
-        foo.title = u"Title 200"
+        foo.title = "Title 200"
 
         self.store.flush()
 
@@ -1904,7 +1903,7 @@
         self.store.flush()
         self.store.add(foo)
 
-        foo.title = u"Title 200"
+        foo.title = "Title 200"
 
         self.store.flush()
 
@@ -1933,7 +1932,7 @@
         self.store.remove(foo)
         self.store.flush()
 
-        foo.title = u"Title 200"
+        foo.title = "Title 200"
 
         self.assertTrue(obj_info not in self.store._dirty)
 
@@ -1957,7 +1956,7 @@
     def test_add_rollback_not_in_store(self):
         foo = Foo()
         foo.id = 40
-        foo.title = u"Title 40"
+        foo.title = "Title 40"
 
         self.store.add(foo)
         self.store.rollback()
@@ -1966,7 +1965,7 @@
 
     def test_update_flush_commit(self):
         foo = self.store.get(Foo, 20)
-        foo.title = u"Title 200"
+        foo.title = "Title 200"
 
         self.assertEqual(self.get_items(), [
                           (10, "Title 30"),
@@ -2002,7 +2001,7 @@
 
     def test_update_flush_reload_rollback(self):
         foo = self.store.get(Foo, 20)
-        foo.title = u"Title 200"
+        foo.title = "Title 200"
         self.store.flush()
         self.store.reload(foo)
         self.store.rollback()
@@ -2010,7 +2009,7 @@
 
     def test_update_commit(self):
         foo = self.store.get(Foo, 20)
-        foo.title = u"Title 200"
+        foo.title = "Title 200"
 
         self.store.commit()
 
@@ -2022,9 +2021,9 @@
 
     def test_update_commit_twice(self):
         foo = self.store.get(Foo, 20)
-        foo.title = u"Title 200"
+        foo.title = "Title 200"
         self.store.commit()
-        foo.title = u"Title 2000"
+        foo.title = "Title 2000"
         self.store.commit()
 
         self.assertEqual(self.get_committed_items(), [
@@ -2035,7 +2034,7 @@
 
     def test_update_checkpoints(self):
         bar = self.store.get(Bar, 200)
-        bar.title = u"Title 400"
+        bar.title = "Title 400"
         self.store.flush()
         self.store.execute("UPDATE bar SET title='Title 500' "
                            "WHERE id=200")
@@ -2099,7 +2098,7 @@
 
     def test_wb_update_not_dirty_after_flush(self):
         foo = self.store.get(Foo, 20)
-        foo.title = u"Title 200"
+        foo.title = "Title 200"
 
         self.store.flush()
 
@@ -2108,7 +2107,7 @@
 
         self.store._disable_change_notification(get_obj_info(foo))
 
-        foo.title = u"Title 2000"
+        foo.title = "Title 2000"
 
         self.store.flush()
 
@@ -2120,9 +2119,9 @@
 
     def test_update_find(self):
         foo = self.store.get(Foo, 20)
-        foo.title = u"Title 200"
+        foo.title = "Title 200"
 
-        result = self.store.find(Foo, Foo.title == u"Title 200")
+        result = self.store.find(Foo, Foo.title == "Title 200")
 
         self.assertTrue(result.one() is foo)
 
@@ -2135,11 +2134,11 @@
     def test_add_update(self):
         foo = Foo()
         foo.id = 40
-        foo.title = u"Title 40"
+        foo.title = "Title 40"
 
         self.store.add(foo)
 
-        foo.title = u"Title 400"
+        foo.title = "Title 400"
 
         self.store.flush()
 
@@ -2153,14 +2152,14 @@
     def test_add_remove_add(self):
         foo = Foo()
         foo.id = 40
-        foo.title = u"Title 40"
+        foo.title = "Title 40"
 
         self.store.add(foo)
         self.store.remove(foo)
 
         self.assertEqual(Store.of(foo), None)
 
-        foo.title = u"Title 400"
+        foo.title = "Title 400"
 
         self.store.add(foo)
 
@@ -2192,7 +2191,7 @@
 
     def test_wb_update_remove_add(self):
         foo = self.store.get(Foo, 20)
-        foo.title = u"Title 200"
+        foo.title = "Title 200"
 
         obj_info = get_obj_info(foo)
 
@@ -2246,14 +2245,14 @@
 
     def test_join(self):
 
-        class Bar(object):
+        class Bar:
             __storm_table__ = "bar"
             id = Int(primary=True)
             title = Unicode()
 
         bar = Bar()
         bar.id = 40
-        bar.title = u"Title 20"
+        bar.title = "Title 20"
 
         self.store.add(bar)
 
@@ -2262,7 +2261,7 @@
 
         bar = Bar()
         bar.id = 400
-        bar.title = u"Title 20"
+        bar.title = "Title 20"
 
         self.store.add(bar)
 
@@ -2275,14 +2274,14 @@
 
     def test_join_distinct(self):
 
-        class Bar(object):
+        class Bar:
             __storm_table__ = "bar"
             id = Int(primary=True)
             title = Unicode()
 
         bar = Bar()
         bar.id = 40
-        bar.title = u"Title 20"
+        bar.title = "Title 20"
 
         self.store.add(bar)
 
@@ -2291,7 +2290,7 @@
 
         bar = Bar()
         bar.id = 400
-        bar.title = u"Title 20"
+        bar.title = "Title 20"
 
         self.store.add(bar)
 
@@ -2330,7 +2329,7 @@
 
         foo = Foo()
         foo.id = 20
-        foo.title = u"Readded"
+        foo.title = "Readded"
         self.store.add(foo)
 
         self.store.commit()
@@ -2346,7 +2345,7 @@
                 loaded.append("NO!")
             def __storm_loaded__(self):
                 loaded.append((self.id, self.title))
-                self.title = u"Title 200"
+                self.title = "Title 200"
                 self.some_attribute = 1
 
         foo = self.store.get(MyFoo, 20)
@@ -2376,7 +2375,7 @@
             counter = 0
             def __storm_pre_flush__(self):
                 if self.counter == 0:
-                    self.title = u"Flushing: %s" % self.title
+                    self.title = "Flushing: %s" % self.title
                 self.counter += 1
 
         foo = self.store.get(MyFoo, 20)
@@ -2384,7 +2383,7 @@
         self.assertEqual(foo.title, "Title 20")
         self.store.flush()
         self.assertEqual(foo.title, "Title 20") # It wasn't dirty.
-        foo.title = u"Something"
+        foo.title = "Something"
         self.store.flush()
         self.assertEqual(foo.title, "Flushing: Something")
 
@@ -2407,11 +2406,11 @@
         class MyFoo(Foo):
             def __storm_pre_flush__(self):
                 other = [foo1, foo2][foo1 is self]
-                other.title = u"Changed in hook: " + other.title
+                other.title = "Changed in hook: " + other.title
 
         foo1 = self.store.get(MyFoo, 10)
         foo2 = self.store.get(MyFoo, 20)
-        foo1.title = u"Changed"
+        foo1.title = "Changed"
         self.store.flush()
 
         self.assertEqual(foo1.title, "Changed in hook: Changed")
@@ -2424,14 +2423,14 @@
             def __storm_flushed__(self):
                 if not self.done:
                     self.done = True
-                    self.title = u"Flushed: %s" % self.title
+                    self.title = "Flushed: %s" % self.title
 
         foo = self.store.get(MyFoo, 20)
 
         self.assertEqual(foo.title, "Title 20")
         self.store.flush()
         self.assertEqual(foo.title, "Title 20") # It wasn't dirty.
-        foo.title = u"Something"
+        foo.title = "Something"
         self.store.flush()
         self.assertEqual(foo.title, "Flushed: Something")
 
@@ -2451,7 +2450,7 @@
 
     def test_retrieve_default_primary_key(self):
         foo = Foo()
-        foo.title = u"Title 40"
+        foo.title = "Title 40"
         self.store.add(foo)
         self.store.flush()
         self.assertNotEqual(foo.id, None)
@@ -2568,13 +2567,13 @@
     def test_reload_new(self):
         foo = Foo()
         foo.id = 40
-        foo.title = u"Title 40"
+        foo.title = "Title 40"
         self.assertRaises(WrongStoreError, self.store.reload, foo)
 
     def test_reload_new_unflushed(self):
         foo = Foo()
         foo.id = 40
-        foo.title = u"Title 40"
+        foo.title = "Title 40"
         self.store.add(foo)
         self.assertRaises(NotFlushedError, self.store.reload, foo)
 
@@ -2592,43 +2591,43 @@
     def test_wb_reload_not_dirty(self):
         foo = self.store.get(Foo, 20)
         obj_info = get_obj_info(foo)
-        foo.title = u"Title 40"
+        foo.title = "Title 40"
         self.store.reload(foo)
         self.assertTrue(obj_info not in self.store._dirty)
 
     def test_find_set_empty(self):
-        self.store.find(Foo, title=u"Title 20").set()
+        self.store.find(Foo, title="Title 20").set()
         foo = self.store.get(Foo, 20)
         self.assertEqual(foo.title, "Title 20")
 
     def test_find_set(self):
-        self.store.find(Foo, title=u"Title 20").set(title=u"Title 40")
+        self.store.find(Foo, title="Title 20").set(title="Title 40")
         foo = self.store.get(Foo, 20)
         self.assertEqual(foo.title, "Title 40")
 
     def test_find_set_with_func_expr(self):
-        self.store.find(Foo, title=u"Title 20").set(title=Lower(u"Title 40"))
+        self.store.find(Foo, title="Title 20").set(title=Lower("Title 40"))
         foo = self.store.get(Foo, 20)
         self.assertEqual(foo.title, "title 40")
 
     def test_find_set_equality_with_func_expr(self):
-        self.store.find(Foo, title=u"Title 20").set(
-            Foo.title == Lower(u"Title 40"))
+        self.store.find(Foo, title="Title 20").set(
+            Foo.title == Lower("Title 40"))
         foo = self.store.get(Foo, 20)
         self.assertEqual(foo.title, "title 40")
 
     def test_find_set_column(self):
-        self.store.find(Bar, title=u"Title 200").set(foo_id=Bar.id)
+        self.store.find(Bar, title="Title 200").set(foo_id=Bar.id)
         bar = self.store.get(Bar, 200)
         self.assertEqual(bar.foo_id, 200)
 
     def test_find_set_expr(self):
-        self.store.find(Foo, title=u"Title 20").set(Foo.title == u"Title 40")
+        self.store.find(Foo, title="Title 20").set(Foo.title == "Title 40")
         foo = self.store.get(Foo, 20)
         self.assertEqual(foo.title, "Title 40")
 
     def test_find_set_none(self):
-        self.store.find(Foo, title=u"Title 20").set(title=None)
+        self.store.find(Foo, title="Title 20").set(title=None)
         foo = self.store.get(Foo, 20)
         self.assertEqual(foo.title, None)
 
@@ -2653,7 +2652,7 @@
 
     def test_find_set_none_on_cached(self):
         foo = self.store.get(Foo, 20)
-        self.store.find(Foo, title=u"Title 20").set(title=None)
+        self.store.find(Foo, title="Title 20").set(title=None)
         self.assertEqual(foo.title, None)
 
     def test_find_set_on_cached_but_removed(self):
@@ -2668,27 +2667,27 @@
         foo1 = self.store.get(Foo, 20)
         foo2 = self.store.get(Foo, 30)
         self.store.find(
-            Foo, Foo.id == Select(SQL("20"))).set(title=u"Title 40")
+            Foo, Foo.id == Select(SQL("20"))).set(title="Title 40")
         self.assertEqual(foo1.title, "Title 40")
         self.assertEqual(foo2.title, "Title 10")
 
     def test_find_set_expr_unsupported(self):
-        result = self.store.find(Foo, title=u"Title 20")
-        self.assertRaises(FeatureError, result.set, Foo.title > u"Title 40")
+        result = self.store.find(Foo, title="Title 20")
+        self.assertRaises(FeatureError, result.set, Foo.title > "Title 40")
 
     def test_find_set_expr_unsupported_without_column(self):
-        result = self.store.find(Foo, title=u"Title 20")
+        result = self.store.find(Foo, title="Title 20")
         self.assertRaises(FeatureError, result.set,
                           Eq(object(), IntVariable(1)))
 
     def test_find_set_expr_unsupported_without_expr_or_variable(self):
-        result = self.store.find(Foo, title=u"Title 20")
+        result = self.store.find(Foo, title="Title 20")
         self.assertRaises(FeatureError, result.set, Eq(Foo.id, object()))
 
     def test_find_set_expr_unsupported_autoreloads(self):
         bar1 = self.store.get(Bar, 200)
         bar2 = self.store.get(Bar, 300)
-        self.store.find(Bar, id=Select(SQL("200"))).set(title=u"Title 400")
+        self.store.find(Bar, id=Select(SQL("200"))).set(title="Title 400")
         bar1_vars = get_obj_info(bar1).variables
         bar2_vars = get_obj_info(bar2).variables
         self.assertEqual(bar1_vars[Bar.title].get_lazy(), AutoReload)
@@ -2707,7 +2706,7 @@
         # column. See Bug #328603 for more info.
         foo1 = self.store.get(Foo, 20)
         bar1 = self.store.get(Bar, 200)
-        self.store.find(Bar, id=Select(SQL("200"))).set(title=u"Title 400")
+        self.store.find(Bar, id=Select(SQL("200"))).set(title="Title 400")
         foo1_vars = get_obj_info(foo1).variables
         bar1_vars = get_obj_info(bar1).variables
         self.assertNotEqual(foo1_vars[Foo.title].get_lazy(), AutoReload)
@@ -2741,7 +2740,7 @@
 
     def test_wb_find_set_checkpoints(self):
         bar = self.store.get(Bar, 200)
-        self.store.find(Bar, id=200).set(title=u"Title 400")
+        self.store.find(Bar, id=200).set(title="Title 400")
         self.store._connection.execute("UPDATE bar SET "
                                        "title='Title 500' "
                                        "WHERE id=200")
@@ -2759,7 +2758,7 @@
         obj_info = get_obj_info(foo)
         del foo
         gc.collect()
-        self.store.find(Foo, title=u"Title 20").set(title=u"Title 40")
+        self.store.find(Foo, title="Title 20").set(title="Title 40")
         foo = self.store.get(Foo, 20)
         self.assertFalse(hasattr(foo, "tainted"))
         self.assertEqual(foo.title, "Title 40")
@@ -2799,7 +2798,7 @@
         """
         self.get_cache(self.store).set_size(0)
         bar = self.store.get(Bar, 100)
-        bar.foo.title = u"Changed title"
+        bar.foo.title = "Changed title"
         bar_ref = weakref.ref(get_obj_info(bar))
         foo = bar.foo
         del bar
@@ -2817,7 +2816,7 @@
             bar = Reference(Foo.id, Bar.foo_id, on_remote=True)
 
         foo = self.store.get(MyFoo, 10)
-        foo.bar.title = u"Changed title"
+        foo.bar.title = "Changed title"
         foo_ref = weakref.ref(get_obj_info(foo))
         bar = foo.bar
         del foo
@@ -2830,13 +2829,13 @@
             pass
         MyBar.foo = Reference(MyBar.title, Foo.title)
         bar = self.store.get(MyBar, 100)
-        bar.title = u"Title 30"
+        bar.title = "Title 30"
         self.store.flush()
         self.assertEqual(bar.foo.id, 10)
         bar.foo.title = SQL("'Title 40'")
         self.assertEqual(bar.foo, None)
-        self.assertEqual(self.store.find(Foo, title=u"Title 30").one(), None)
-        self.assertEqual(self.store.get(Foo, 10).title, u"Title 40")
+        self.assertEqual(self.store.find(Foo, title="Title 30").one(), None)
+        self.assertEqual(self.store.get(Foo, 10).title, "Title 40")
 
     def test_reference_on_non_primary_key(self):
         self.store.execute("INSERT INTO bar VALUES (400, 40, 'Title 30')")
@@ -2856,7 +2855,7 @@
     def test_new_reference(self):
         bar = Bar()
         bar.id = 400
-        bar.title = u"Title 400"
+        bar.title = "Title 400"
         bar.foo_id = 10
 
         self.assertEqual(bar.foo, None)
@@ -2895,12 +2894,12 @@
 
     def test_reference_on_added(self):
         foo = Foo()
-        foo.title = u"Title 40"
+        foo.title = "Title 40"
         self.store.add(foo)
 
         bar = Bar()
         bar.id = 400
-        bar.title = u"Title 400"
+        bar.title = "Title 400"
         bar.foo = foo
         self.store.add(bar)
 
@@ -2920,12 +2919,12 @@
 
     def test_reference_on_added_with_autoreload_key(self):
         foo = Foo()
-        foo.title = u"Title 40"
+        foo.title = "Title 40"
         self.store.add(foo)
 
         bar = Bar()
         bar.id = 400
-        bar.title = u"Title 400"
+        bar.title = "Title 400"
         bar.foo = foo
         self.store.add(bar)
 
@@ -2952,11 +2951,11 @@
 
     def test_reference_assign_none(self):
         foo = Foo()
-        foo.title = u"Title 40"
+        foo.title = "Title 40"
 
         bar = Bar()
         bar.id = 400
-        bar.title = u"Title 400"
+        bar.title = "Title 400"
         bar.foo = foo
         bar.foo = None
         bar.foo = None # Twice to make sure it doesn't blow up.
@@ -2973,7 +2972,7 @@
         self.assertEqual(bar.foo, None)
 
     def test_reference_on_added_composed_key(self):
-        class Bar(object):
+        class Bar:
             __storm_table__ = "bar"
             id = Int(primary=True)
             foo_id = Int()
@@ -2981,7 +2980,7 @@
             foo = Reference((foo_id, title), (Foo.id, Foo.title))
 
         foo = Foo()
-        foo.title = u"Title 40"
+        foo.title = "Title 40"
         self.store.add(foo)
 
         bar = Bar()
@@ -3004,7 +3003,7 @@
         self.assertEqual(result.get_one(), ("Title 40",))
 
     def test_reference_assign_composed_remote_key(self):
-        class Bar(object):
+        class Bar:
             __storm_table__ = "bar"
             id = Int(primary=True)
             foo_id = Int()
@@ -3013,7 +3012,7 @@
 
         bar = Bar()
         bar.id = 400
-        bar.foo = (20, u"Title 20")
+        bar.foo = (20, "Title 20")
         self.store.add(bar)
 
         self.assertEqual(bar.foo_id, 20)
@@ -3023,13 +3022,13 @@
 
     def test_reference_on_added_unlink_on_flush(self):
         foo = Foo()
-        foo.title = u"Title 40"
+        foo.title = "Title 40"
         self.store.add(foo)
 
         bar = Bar()
         bar.id = 400
         bar.foo = foo
-        bar.title = u"Title 400"
+        bar.title = "Title 400"
         self.store.add(bar)
 
         foo.id = 40
@@ -3057,15 +3056,15 @@
 
     def test_reference_on_two_added(self):
         foo1 = Foo()
-        foo1.title = u"Title 40"
+        foo1.title = "Title 40"
         foo2 = Foo()
-        foo2.title = u"Title 40"
+        foo2.title = "Title 40"
         self.store.add(foo1)
         self.store.add(foo2)
 
         bar = Bar()
         bar.id = 400
-        bar.title = u"Title 400"
+        bar.title = "Title 400"
         bar.foo = foo1
         bar.foo = foo2
         self.store.add(bar)
@@ -3077,12 +3076,12 @@
 
     def test_reference_on_added_and_changed_manually(self):
         foo = Foo()
-        foo.title = u"Title 40"
+        foo.title = "Title 40"
         self.store.add(foo)
 
         bar = Bar()
         bar.id = 400
-        bar.title = u"Title 400"
+        bar.title = "Title 400"
         bar.foo = foo
         self.store.add(bar)
 
@@ -3091,7 +3090,7 @@
         self.assertEqual(bar.foo_id, 40)
 
     def test_reference_on_added_composed_key_changed_manually(self):
-        class Bar(object):
+        class Bar:
             __storm_table__ = "bar"
             id = Int(primary=True)
             foo_id = Int()
@@ -3099,7 +3098,7 @@
             foo = Reference((foo_id, title), (Foo.id, Foo.title))
 
         foo = Foo()
-        foo.title = u"Title 40"
+        foo.title = "Title 40"
         self.store.add(foo)
 
         bar = Bar()
@@ -3107,7 +3106,7 @@
         bar.foo = foo
         self.store.add(bar)
 
-        bar.title = u"Title 50"
+        bar.title = "Title 50"
 
         self.assertEqual(bar.foo, None)
 
@@ -3117,12 +3116,12 @@
 
     def test_reference_on_added_no_local_store(self):
         foo = Foo()
-        foo.title = u"Title 40"
+        foo.title = "Title 40"
         self.store.add(foo)
 
         bar = Bar()
         bar.id = 400
-        bar.title = u"Title 400"
+        bar.title = "Title 400"
         bar.foo = foo
 
         self.assertEqual(Store.of(bar), self.store)
@@ -3130,11 +3129,11 @@
 
     def test_reference_on_added_no_remote_store(self):
         foo = Foo()
-        foo.title = u"Title 40"
+        foo.title = "Title 40"
 
         bar = Bar()
         bar.id = 400
-        bar.title = u"Title 400"
+        bar.title = "Title 400"
         self.store.add(bar)
 
         bar.foo = foo
@@ -3144,11 +3143,11 @@
 
     def test_reference_on_added_no_store(self):
         foo = Foo()
-        foo.title = u"Title 40"
+        foo.title = "Title 40"
 
         bar = Bar()
         bar.id = 400
-        bar.title = u"Title 400"
+        bar.title = "Title 400"
         bar.foo = foo
 
         self.store.add(bar)
@@ -3162,11 +3161,11 @@
 
     def test_reference_on_added_no_store_2(self):
         foo = Foo()
-        foo.title = u"Title 40"
+        foo.title = "Title 40"
 
         bar = Bar()
         bar.id = 400
-        bar.title = u"Title 400"
+        bar.title = "Title 400"
         bar.foo = foo
 
         self.store.add(foo)
@@ -3182,23 +3181,23 @@
         store = self.create_store()
 
         foo = Foo()
-        foo.title = u"Title 40"
+        foo.title = "Title 40"
         store.add(foo)
 
         bar = Bar()
         bar.id = 400
-        bar.title = u"Title 400"
+        bar.title = "Title 400"
         self.store.add(bar)
 
         self.assertRaises(WrongStoreError, setattr, bar, "foo", foo)
 
     def test_reference_on_added_no_store_unlink_before_adding(self):
         foo1 = Foo()
-        foo1.title = u"Title 40"
+        foo1.title = "Title 40"
 
         bar = Bar()
         bar.id = 400
-        bar.title = u"Title 400"
+        bar.title = "Title 400"
         bar.foo = foo1
         bar.foo = None
 
@@ -3287,7 +3286,7 @@
     def test_reference_self(self):
         selfref = self.store.add(SelfRef())
         selfref.id = 400
-        selfref.title = u"Title 400"
+        selfref.title = "Title 400"
         selfref.selfref_id = 25
         self.assertEqual(selfref.selfref.id, 25)
         self.assertEqual(selfref.selfref.title, "SelfRef 25")
@@ -3300,7 +3299,7 @@
     def test_reference_wont_touch_store_when_key_is_none(self):
         bar = self.store.get(Bar, 200)
         bar.foo_id = None
-        bar.title = u"Don't flush this!"
+        bar.title = "Don't flush this!"
 
         self.assertEqual(bar.foo, None)
 
@@ -3310,7 +3309,7 @@
     def test_reference_wont_touch_store_when_key_is_unset(self):
         bar = self.store.get(Bar, 200)
         del bar.foo_id
-        bar.title = u"Don't flush this!"
+        bar.title = "Don't flush this!"
 
         self.assertEqual(bar.foo, None)
 
@@ -3320,7 +3319,7 @@
         self.assertEqual(result.get_one()[0], "Title 200")
 
     def test_reference_wont_touch_store_with_composed_key_none(self):
-        class Bar(object):
+        class Bar:
             __storm_table__ = "bar"
             id = Int(primary=True)
             foo_id = Int()
@@ -3354,12 +3353,12 @@
             bar = Reference(Foo.id, Bar.foo_id, on_remote=True)
 
         bar = Bar()
-        bar.title = u"Title 400"
+        bar.title = "Title 400"
         self.store.add(bar)
 
         foo = MyFoo()
         foo.bar = bar
-        foo.title = u"Title 40"
+        foo.title = "Title 40"
         self.store.add(foo)
 
         self.store.flush()
@@ -3378,12 +3377,12 @@
             bar = Reference(Foo.id, Bar.foo_id, on_remote=True)
 
         bar = Bar()
-        bar.title = u"Title 400"
+        bar.title = "Title 400"
         self.store.add(bar)
 
         foo = MyFoo()
         foo.bar = bar
-        foo.title = u"Title 40"
+        foo.title = "Title 40"
         self.store.add(foo)
 
         foo.id = 40
@@ -3437,11 +3436,11 @@
             bar = Reference(Foo.id, Bar.foo_id, on_remote=True)
 
         bar = Bar()
-        bar.title = u"Title 400"
+        bar.title = "Title 400"
 
         foo = MyFoo()
         foo.bar = bar
-        foo.title = u"Title 40"
+        foo.title = "Title 40"
 
         self.store.add(bar)
 
@@ -3457,11 +3456,11 @@
             bar = Reference(Foo.id, Bar.foo_id, on_remote=True)
 
         bar = Bar()
-        bar.title = u"Title 400"
+        bar.title = "Title 400"
 
         foo = MyFoo()
         foo.bar = bar
-        foo.title = u"Title 40"
+        foo.title = "Title 40"
 
         self.store.add(foo)
 
@@ -3477,10 +3476,10 @@
             bar = Reference(Foo.id, Bar.foo_id, on_remote=True)
 
         bar = Bar()
-        bar.title = u"Title 400"
+        bar.title = "Title 400"
 
         foo = MyFoo()
-        foo.title = u"Title 40"
+        foo.title = "Title 40"
         foo.bar = bar
 
         self.store.add(foo)
@@ -3495,10 +3494,10 @@
             bar = Reference(Foo.id, Bar.foo_id, on_remote=True)
 
         bar = Bar()
-        bar.title = u"Title 400"
+        bar.title = "Title 400"
 
         foo = MyFoo()
-        foo.title = u"Title 40"
+        foo.title = "Title 40"
         foo.bar = bar
 
         self.store.add(foo)
@@ -3673,7 +3672,7 @@
         bar = Bar()
         bar.id = 400
         bar.foo_id = 20
-        bar.title = u"Title 100"
+        bar.title = "Title 100"
         self.store.add(bar)
 
     def test_reference_set(self):
@@ -3718,13 +3717,13 @@
     def test_reference_set_with_added(self):
         bar1 = Bar()
         bar1.id = 400
-        bar1.title = u"Title 400"
+        bar1.title = "Title 400"
         bar2 = Bar()
         bar2.id = 500
-        bar2.title = u"Title 500"
+        bar2.title = "Title 500"
 
         foo = FooRefSet()
-        foo.title = u"Title 40"
+        foo.title = "Title 40"
         foo.bars.add(bar1)
         foo.bars.add(bar2)
 
@@ -3743,7 +3742,7 @@
         self.add_reference_set_bar_400()
 
         bar = self.store.get(Bar, 400)
-        bar.title = u"Title 20"
+        bar.title = "Title 20"
 
         class FooRefSetComposed(Foo):
             bars = ReferenceSet((Foo.id, Foo.title),
@@ -3760,7 +3759,7 @@
                          ])
 
         bar = self.store.get(Bar, 200)
-        bar.title = u"Title 20"
+        bar.title = "Title 20"
 
         del items[:]
         for bar in foo.bars:
@@ -3803,11 +3802,11 @@
         # Notice that there's another item with this title in the base,
         # which isn't part of the reference.
 
-        objects = list(foo.bars.find(Bar.title == u"Title 100"))
+        objects = list(foo.bars.find(Bar.title == "Title 100"))
         self.assertEqual(len(objects), 1)
         self.assertTrue(objects[0] is bar)
 
-        objects = list(foo.bars.find(title=u"Title 100"))
+        objects = list(foo.bars.find(title="Title 100"))
         self.assertEqual(len(objects), 1)
         self.assertTrue(objects[0] is bar)
 
@@ -4048,7 +4047,7 @@
     def test_reference_set_add(self):
         bar = Bar()
         bar.id = 400
-        bar.title = u"Title 100"
+        bar.title = "Title 100"
 
         foo = self.store.get(FooRefSet, 20)
         foo.bars.add(bar)
@@ -4059,10 +4058,10 @@
     def test_reference_set_add_no_store(self):
         bar = Bar()
         bar.id = 400
-        bar.title = u"Title 400"
+        bar.title = "Title 400"
 
         foo = FooRefSet()
-        foo.title = u"Title 40"
+        foo.title = "Title 40"
         foo.bars.add(bar)
 
         self.store.add(foo)
@@ -4077,10 +4076,10 @@
     def test_reference_set_add_no_store_2(self):
         bar = Bar()
         bar.id = 400
-        bar.title = u"Title 400"
+        bar.title = "Title 400"
 
         foo = FooRefSet()
-        foo.title = u"Title 40"
+        foo.title = "Title 40"
         foo.bars.add(bar)
 
         self.store.add(bar)
@@ -4095,13 +4094,13 @@
     def test_reference_set_add_no_store_unlink_after_adding(self):
         bar1 = Bar()
         bar1.id = 400
-        bar1.title = u"Title 400"
+        bar1.title = "Title 400"
         bar2 = Bar()
         bar2.id = 500
-        bar2.title = u"Title 500"
+        bar2.title = "Title 500"
 
         foo = FooRefSet()
-        foo.title = u"Title 40"
+        foo.title = "Title 40"
         foo.bars.add(bar1)
         foo.bars.add(bar2)
         foo.bars.remove(bar1)
@@ -4152,15 +4151,15 @@
     def test_indirect_reference_set_with_added(self):
         bar1 = Bar()
         bar1.id = 400
-        bar1.title = u"Title 400"
+        bar1.title = "Title 400"
         bar2 = Bar()
         bar2.id = 500
-        bar2.title = u"Title 500"
+        bar2.title = "Title 500"
         self.store.add(bar1)
         self.store.add(bar2)
 
         foo = FooIndRefSet()
-        foo.title = u"Title 40"
+        foo.title = "Title 40"
         foo.bars.add(bar1)
         foo.bars.add(bar2)
 
@@ -4181,7 +4180,7 @@
         foo = self.store.get(FooIndRefSet, 20)
 
         items = []
-        for bar in foo.bars.find(Bar.title == u"Title 300"):
+        for bar in foo.bars.find(Bar.title == "Title 300"):
             items.append((bar.id, bar.title))
         items.sort()
 
@@ -4454,10 +4453,10 @@
         foo.id = 40
         bar1 = Bar()
         bar1.id = 400
-        bar1.title = u"Title 400"
+        bar1.title = "Title 400"
         bar2 = Bar()
         bar2.id = 500
-        bar2.title = u"Title 500"
+        bar2.title = "Title 500"
         self.store.add(foo)
         self.store.add(bar1)
         self.store.add(bar2)
@@ -4478,13 +4477,13 @@
     def test_indirect_reference_set_with_added_no_store(self):
         bar1 = Bar()
         bar1.id = 400
-        bar1.title = u"Title 400"
+        bar1.title = "Title 400"
         bar2 = Bar()
         bar2.id = 500
-        bar2.title = u"Title 500"
+        bar2.title = "Title 500"
 
         foo = FooIndRefSet()
-        foo.title = u"Title 40"
+        foo.title = "Title 40"
 
         foo.bars.add(bar1)
         foo.bars.add(bar2)
@@ -4629,7 +4628,7 @@
         foo5 = Foo()
 
         for i, foo in enumerate([foo1, foo2, foo3, foo4, foo5]):
-            foo.title = u"Object %d" % (i+1)
+            foo.title = "Object %d" % (i+1)
             self.store.add(foo)
 
         self.store.add_flush_order(foo2, foo4)
@@ -4660,7 +4659,7 @@
 
     def test_variable_filter_on_update(self):
         foo = self.store.get(FooVariable, 20)
-        foo.title = u"Title 20"
+        foo.title = "Title 20"
 
         self.store.flush()
 
@@ -4682,7 +4681,7 @@
     def test_variable_filter_on_insert(self):
         foo = FooVariable()
         foo.id = 40
-        foo.title = u"Title 40"
+        foo.title = "Title 40"
 
         self.store.add(foo)
         self.store.flush()
@@ -4705,7 +4704,7 @@
 
     def test_variable_filter_on_set(self):
         foo = FooVariable()
-        self.store.find(FooVariable, id=20).set(title=u"Title 20")
+        self.store.find(FooVariable, id=20).set(title="Title 20")
 
         self.assertEqual(self.get_items(), [
                           (10, "Title 30"),
@@ -4716,7 +4715,7 @@
     def test_variable_filter_on_set_expr(self):
         foo = FooVariable()
         result = self.store.find(FooVariable, id=20)
-        result.set(FooVariable.title == u"Title 20")
+        result.set(FooVariable.title == "Title 20")
 
         self.assertEqual(self.get_items(), [
                           (10, "Title 30"),
@@ -4730,7 +4729,7 @@
         class MyResult(Result):
             def set_variable(self, variable, value):
                 if variable.__class__ is UnicodeVariable:
-                    variable.set(u"set_variable(%s)" % value)
+                    variable.set("set_variable(%s)" % value)
                 elif variable.__class__ is IntVariable:
                     variable.set(value+1)
                 else:
@@ -4747,7 +4746,7 @@
 
     def test_default(self):
         class MyFoo(Foo):
-            title = Unicode(default=u"Some default value")
+            title = Unicode(default="Some default value")
 
         foo = MyFoo()
         self.store.add(foo)
@@ -4761,7 +4760,7 @@
 
     def test_default_factory(self):
         class MyFoo(Foo):
-            title = Unicode(default_factory=lambda:u"Some default value")
+            title = Unicode(default_factory=lambda:"Some default value")
 
         foo = MyFoo()
         self.store.add(foo)
@@ -4927,14 +4926,14 @@
         it is used to fill up any undefined variables.
         """
         # We do a first find to get the object_infos into the cache.
-        foos = list(self.store.find(Foo, title=u"Title 20"))
+        foos = list(self.store.find(Foo, title="Title 20"))
 
         # Commit so that all foos are invalidated and variables are
         # set back to AutoReload.
         self.store.commit()
 
         # Another find which should reuse in-memory foos.
-        for foo in self.store.find(Foo, title=u"Title 20"):
+        for foo in self.store.find(Foo, title="Title 20"):
             # Make sure we have all variables defined, because
             # values were already retrieved by the find's select.
             obj_info = get_obj_info(foo)
@@ -4969,7 +4968,7 @@
         # set back to AutoReload.
         self.store.commit()
 
-        foo = self.store.find(MyFoo, title=u"Title 20").one()
+        foo = self.store.find(MyFoo, title="Title 20").one()
         self.assertEqual(foo.id, 20)
         self.assertEqual(len(loaded), 2)
 
@@ -4982,7 +4981,7 @@
         """
         blob = self.store.get(Blob, 20)
         blob.bin = b"\x80\x02}q\x01U\x01aK\x01s."
-        class PickleBlob(object):
+        class PickleBlob:
             __storm_table__ = "bin"
             id = Int(primary=True)
             pickle = Pickle("bin")
@@ -5024,7 +5023,7 @@
 
         new_obj = DictFoo()
         new_obj.id = 40
-        new_obj.title = u"My Title"
+        new_obj.title = "My Title"
 
         self.store.add(new_obj)
         self.store.commit()
@@ -5122,7 +5121,7 @@
         self.assertTrue(lazy_value is AutoReload)
 
         # Which gets resolved once touched.
-        self.assertEqual(foo.title, u"New title")
+        self.assertEqual(foo.title, "New title")
 
     def test_expr_values_flush_on_demand_with_added(self):
         foo = Foo()
@@ -5353,7 +5352,7 @@
         foo = Foo()
         self.store.add(foo)
         foo.id = AutoReload
-        foo.title = u"New Title"
+        foo.title = "New Title"
         self.assertTrue(isinstance(foo.id, int))
         self.assertEqual(foo.title, "New Title")
 
@@ -5401,7 +5400,7 @@
         self.store.flush()
         lazy_value = get_obj_info(foo).variables[Foo.title].get_lazy()
         self.assertEqual(lazy_value, AutoReload)
-        self.assertEqual(foo.title, u"Default Title")
+        self.assertEqual(foo.title, "Default Title")
 
     def test_reference_break_on_local_diverged_doesnt_autoreload(self):
         foo = self.store.get(Foo, 10)
@@ -5422,7 +5421,7 @@
         committed, detecting if the referenced object has been removed behind
         its back.
         """
-        class BarOnRemote(object):
+        class BarOnRemote:
             __storm_table__ = "bar"
             foo_id = Int(primary=True)
             foo = Reference(foo_id, Foo.id, on_remote=True)
@@ -5476,7 +5475,7 @@
         self.store.add(foo)
         self.store.invalidate(foo)
         foo.id = 40
-        foo.title = u"Title 40"
+        foo.title = "Title 40"
         self.store.flush()
 
         # Object must have a valid cache at this point, since it was
@@ -5488,7 +5487,7 @@
         foo = self.store.get(Foo, 20)
         self.store.execute("DELETE FROM foo WHERE id=20")
         self.store.invalidate(foo)
-        self.assertRaises(LostObjectError, setattr, foo, "title", u"Title 40")
+        self.assertRaises(LostObjectError, setattr, foo, "title", "Title 40")
 
     def test_invalidated_objects_reloaded_by_get(self):
         foo = self.store.get(Foo, 20)
@@ -5496,7 +5495,7 @@
         foo = self.store.get(Foo, 20)
         title_variable = get_obj_info(foo).variables[Foo.title]
         self.assertEqual(title_variable.get_lazy(), None)
-        self.assertEqual(title_variable.get(), u"Title 20")
+        self.assertEqual(title_variable.get(), "Title 20")
         self.assertEqual(foo.title, "Title 20")
 
     def test_invalidated_hook(self):
@@ -5548,7 +5547,7 @@
         """
         foo1 = self.store.get(Foo, 10)
         foo1_title = foo1.title
-        foo1.title = u"radix wuz here"
+        foo1.title = "radix wuz here"
         self.store.reset()
         self.store.flush()
         new_foo1 = self.store.get(Foo, 10)
@@ -5587,14 +5586,14 @@
     def test_result_find_introduce_join(self):
         result1 = self.store.find(Foo, Foo.id <= 20)
         result2 = result1.find(Foo.id == Bar.foo_id,
-                               Bar.title == u"Title 300")
+                               Bar.title == "Title 300")
         foo = result2.one()
         self.assertTrue(foo)
         self.assertEqual(foo.id, 10)
 
     def test_result_find_tuple(self):
         result1 = self.store.find((Foo, Bar), Foo.id == Bar.foo_id)
-        result2 = result1.find(Bar.title == u"Title 100")
+        result2 = result1.find(Bar.title == "Title 100")
         foo_bar = result2.one()
         self.assertTrue(foo_bar)
         foo, bar = foo_bar
@@ -5694,7 +5693,7 @@
         result2 = self.store.find(Foo, id=10)
         result3 = result1.union(result2)
 
-        self.assertRaises(FeatureError, result3.set, title=u"Title 40")
+        self.assertRaises(FeatureError, result3.set, title="Title 40")
         self.assertRaises(FeatureError, result3.remove)
 
     def test_result_union_count(self):
@@ -5848,7 +5847,7 @@
         self.assertEqual(bar.foo_title, "Title 20")
 
     def test_proxy_equals(self):
-        bar = self.store.find(BarProxy, BarProxy.foo_title == u"Title 20").one()
+        bar = self.store.find(BarProxy, BarProxy.foo_title == "Title 20").one()
         self.assertTrue(bar)
         self.assertEqual(bar.id, 200)
 
@@ -5859,7 +5858,7 @@
 
     def test_proxy_set(self):
         bar = self.store.get(BarProxy, 200)
-        bar.foo_title = u"New Title"
+        bar.foo_title = "New Title"
         foo = self.store.get(Foo, 20)
         self.assertEqual(foo.title, "New Title")
 
@@ -5888,7 +5887,7 @@
 
     def test_proxy_with_string_variable_factory_attribute(self):
         MyBarProxy, MyFoo = self.get_bar_proxy_with_string()
-        variable = MyBarProxy.foo_title.variable_factory(value=u"Hello")
+        variable = MyBarProxy.foo_title.variable_factory(value="Hello")
         self.assertTrue(isinstance(variable, UnicodeVariable))
 
     def test_proxy_with_extra_table(self):
@@ -5897,13 +5896,13 @@
         more tables in the query.
         """
         result = self.store.find((BarProxy, Link),
-                                 BarProxy.foo_title == u"Title 20",
+                                 BarProxy.foo_title == "Title 20",
                                  BarProxy.foo_id == Link.foo_id)
         results = list(result)
         self.assertEqual(len(results), 2)
         for bar, link in results:
             self.assertEqual(bar.id, 200)
-            self.assertEqual(bar.foo_title, u"Title 20")
+            self.assertEqual(bar.foo_title, "Title 20")
             self.assertEqual(bar.foo_id, 20)
             self.assertEqual(link.foo_id, 20)
 
@@ -5942,7 +5941,7 @@
             check.append([column.name for column in primary_columns])
             primary_variables[0].set(SQL("40"))
 
-        class DatabaseWrapper(object):
+        class DatabaseWrapper:
             """Wrapper to inject our custom preset_primary_key hook."""
 
             def __init__(self, database):
@@ -6027,7 +6026,7 @@
             pass
         foo = self.store.get(Foo, 20)
         myfoo = self.store.get(MyFoo, 20)
-        for title in [u'Cừơng', u'Đức', u'Hạnh']:
+        for title in ['Cừơng', 'Đức', 'Hạnh']:
             foo.title = title
             self.store.commit()
             try:
@@ -6055,7 +6054,7 @@
 
         MyFoo.sequence = 0
         for foo in foos:
-            foo.title = u"Changed Title"
+            foo.title = "Changed Title"
         self.store.flush()
 
         for i, foo in enumerate(foos):
@@ -6089,16 +6088,16 @@
         """
         store = self.create_store()
         foo2 = store.get(Foo, 10)
-        self.assertEqual(foo2.title, u"Title 30")
+        self.assertEqual(foo2.title, "Title 30")
         store.commit()
 
         foo1 = self.store.get(Foo, 10)
-        foo1.title = u"Title 40"
+        foo1.title = "Title 40"
         self.store.commit()
 
-        foo2.title = u"Title 30"
+        foo2.title = "Title 30"
         store.commit()
-        self.assertEqual(foo2.title, u"Title 30")
+        self.assertEqual(foo2.title, "Title 30")
 
     def test_execute_sends_event(self):
         """Statement execution emits the register-transaction event."""
@@ -6131,7 +6130,7 @@
             calls.append(owner)
         self.store._event.hook("register-transaction", register_transaction)
         foo = Foo()
-        foo.title = u"Foo"
+        foo.title = "Foo"
         self.store.add(foo)
         self.assertEqual(len(calls), 1)
         self.assertEqual(calls[0], self.store)
@@ -6160,7 +6159,7 @@
         self.store.rollback()
         del calls[:]
 
-        foo.title = u"New title"
+        foo.title = "New title"
         self.assertEqual(len(calls), 1)
         self.assertEqual(calls[0], self.store)
 
@@ -6170,7 +6169,7 @@
         self.assertEqual(result_to_remove.remove(), 3)
 
 
-class EmptyResultSetTest(object):
+class EmptyResultSetTest:
 
     def setUp(self):
         self.create_database()
@@ -6346,8 +6345,8 @@
         self.assertEqual(self.empty.cached(), [])
 
     def test_find(self):
-        self.assertEqual(list(self.result.find(Foo.title == u"foo")), [])
-        self.assertEqual(list(self.empty.find(Foo.title == u"foo")), [])
+        self.assertEqual(list(self.result.find(Foo.title == "foo")), [])
+        self.assertEqual(list(self.empty.find(Foo.title == "foo")), [])
 
     def test_union(self):
         self.assertEqual(self.empty.union(self.empty), self.empty)
 
=== modified file 'storm/tests/store/block.py'
--- storm/tests/store/block.py	2020-03-18 16:20:14 +0000
+++ storm/tests/store/block.py	2024-03-13 16:26:38 +0000
@@ -30,7 +30,7 @@
     helpers = [MakePath]
 
     def setUp(self):
-        super(BlockAccessTest, self).setUp()
+        super().setUp()
         database = SQLite(URI("sqlite:"))
         self.store = Store(database)
 
 
=== modified file 'storm/tests/store/postgres.py'
--- storm/tests/store/postgres.py	2024-03-04 10:59:55 +0000
+++ storm/tests/store/postgres.py	2024-03-13 16:26:38 +0000
@@ -28,17 +28,17 @@
 from storm.tests.helper import TestHelper
 
 
-class Lst1(object):
+class Lst1:
     __storm_table__ = "lst1"
     id = Int(primary=True)
     ints = List(type=Int())
 
-class LstEnum(object):
+class LstEnum:
     __storm_table__ = "lst1"
     id = Int(primary=True)
     ints = List(type=Enum(map={"one": 1, "two": 2, "three": 3}))
 
-class Lst2(object):
+class Lst2:
     __storm_table__ = "lst2"
     id = Int(primary=True)
     ints = List(type=List(type=Int()))
@@ -170,7 +170,7 @@
 
     def test_add_find_with_schema(self):
         foo = FooWithSchema()
-        foo.title = u"Title"
+        foo.title = "Title"
         self.store.add(foo)
         self.store.flush()
         # We use find() here to actually exercise the backend code.
 
=== modified file 'storm/tests/tracer.py'
--- storm/tests/tracer.py	2024-03-04 10:59:55 +0000
+++ storm/tests/tracer.py	2024-03-13 16:26:38 +0000
@@ -32,7 +32,7 @@
 class TracerTest(TestHelper):
 
     def tearDown(self):
-        super(TracerTest, self).tearDown()
+        super().tearDown()
         del _tracers[:]
 
     def test_install_tracer(self):
@@ -63,7 +63,7 @@
         self.assertEqual(get_tracers(), [])
 
     def test_remove_tracer_type(self):
-        class C(object):
+        class C:
             pass
 
         class D(C):
@@ -100,7 +100,7 @@
     def test_trace(self):
         stash = []
 
-        class Tracer(object):
+        class Tracer:
             def m1(_, *args, **kwargs):
                 stash.extend(["m1", args, kwargs])
 
@@ -126,7 +126,7 @@
 class DebugTracerTest(TestHelper):
 
     def setUp(self):
-        super(DebugTracerTest, self).setUp()
+        super().setUp()
         self.stream = self.mocker.mock(type(sys.stderr))
         self.tracer = DebugTracer(self.stream)
 
@@ -139,7 +139,7 @@
 
     def tearDown(self):
         del _tracers[:]
-        super(DebugTracerTest, self).tearDown()
+        super().tearDown()
 
     def test_wb_debug_tracer_uses_stderr_by_default(self):
         self.mocker.replay()
@@ -233,7 +233,7 @@
     tracer_class = TimeoutTracer
 
     def setUp(self):
-        super(TimeoutTracerTestBase, self).setUp()
+        super().setUp()
         self.tracer = self.tracer_class()
         self.raw_cursor = self.mocker.mock()
         self.statement = self.mocker.mock()
@@ -241,13 +241,13 @@
 
         # Some data is kept in the connection, so we use a proxy to
         # allow things we don't care about here to happen.
-        class Connection(object):
+        class Connection:
             pass
 
         self.connection = self.mocker.proxy(Connection())
 
     def tearDown(self):
-        super(TimeoutTracerTestBase, self).tearDown()
+        super().tearDown()
         del _tracers[:]
 
     def execute(self):
@@ -384,14 +384,14 @@
 class TimeoutTracerWithDBTest(TestHelper):
 
     def setUp(self):
-        super(TimeoutTracerWithDBTest, self).setUp()
+        super().setUp()
         self.tracer = StuckInTimeTimeoutTracer(10)
         install_tracer(self.tracer)
         database = create_database(os.environ["STORM_POSTGRES_URI"])
         self.connection = database.connect()
 
     def tearDown(self):
-        super(TimeoutTracerWithDBTest, self).tearDown()
+        super().tearDown()
         remove_tracer(self.tracer)
         self.connection.close()
 
@@ -430,7 +430,7 @@
 class StuckInTimeTimeoutTracer(TimeoutTracer):
 
     def __init__(self, fixed_remaining_time):
-        super(StuckInTimeTimeoutTracer, self).__init__()
+        super().__init__()
         self.set_statement_timeout_calls = []
         self.fixed_remaining_time = fixed_remaining_time
 
@@ -467,7 +467,7 @@
         tracer = self.LoggingBaseStatementTracer()
         conn = StubConnection()
         conn.param_mark = '%s'
-        var1 = MockVariable(u'VAR1')
+        var1 = MockVariable('VAR1')
         tracer.connection_raw_execute(
             conn, 'cursor', 'SELECT * FROM person where name = %s', [var1])
         self.assertEqual(
@@ -478,7 +478,7 @@
         """String parameters are formatted as a single quoted string."""
         tracer = self.LoggingBaseStatementTracer()
         conn = StubConnection()
-        var1 = MockVariable(u'VAR1')
+        var1 = MockVariable('VAR1')
         tracer.connection_raw_execute(
             conn, 'cursor', 'SELECT * FROM person where name = ?', [var1])
         self.assertEqual(
@@ -513,7 +513,7 @@
         """% operators in LIKE statements are preserved."""
         tracer = self.LoggingBaseStatementTracer()
         conn = StubConnection()
-        var1 = MockVariable(u'substring')
+        var1 = MockVariable('substring')
         tracer.connection_raw_execute(
             conn, 'cursor',
             "SELECT * FROM person WHERE name LIKE '%%' || ? || '-suffix%%'",
@@ -526,14 +526,14 @@
     def test_unformattable_statements_are_handled(self):
         tracer = self.LoggingBaseStatementTracer()
         conn = StubConnection()
-        var1 = MockVariable(u'substring')
+        var1 = MockVariable('substring')
         tracer.connection_raw_execute(
             conn, 'cursor', "%s %s",
             [var1])
         self.assertEqual(
             [(conn, 'cursor',
               "Unformattable query: '%%s %%s' with params [%r]." %
-              u'substring')],
+              'substring')],
             tracer.calls)
 
 
@@ -605,7 +605,7 @@
         return has_fixtures
 
     def tearDown(self):
-        super(CaptureTracerTest, self).tearDown()
+        super().tearDown()
         del _tracers[:]
 
     def test_capture(self):
@@ -617,7 +617,7 @@
         self.assertEqual([tracer], get_tracers())
         conn = StubConnection()
         conn.param_mark = '%s'
-        var = MockVariable(u"var")
+        var = MockVariable("var")
         tracer.connection_raw_execute(conn, "cursor", "select %s", [var])
         self.assertEqual(["select 'var'"], tracer.queries)
 
 
=== modified file 'storm/tests/variables.py'
--- storm/tests/variables.py	2024-03-04 10:59:55 +0000
+++ storm/tests/variables.py	2024-03-13 16:26:38 +0000
@@ -35,7 +35,7 @@
 from storm.tests.helper import TestHelper
 
 
-class Marker(object):
+class Marker:
     pass
 
 marker = Marker()
@@ -461,15 +461,15 @@
         self.assertEqual(variable.get(), b"str")
         variable.set(memoryview(b"buffer"))
         self.assertEqual(variable.get(), b"buffer")
-        self.assertRaises(TypeError, variable.set, u"unicode")
+        self.assertRaises(TypeError, variable.set, "unicode")
 
 
 class UnicodeVariableTest(TestHelper):
 
     def test_set_get(self):
         variable = UnicodeVariable()
-        variable.set(u"unicode")
-        self.assertEqual(variable.get(), u"unicode")
+        variable.set("unicode")
+        self.assertEqual(variable.get(), "unicode")
         self.assertRaises(TypeError, variable.set, b"str")
 
 
@@ -814,7 +814,7 @@
         self.assertRaises(TypeError, variable.set,
                           "0609f76b-878f-4546-baf5-c1b135e8de72")
         self.assertRaises(TypeError, variable.set,
-                          u"0609f76b-878f-4546-baf5-c1b135e8de72")
+                          "0609f76b-878f-4546-baf5-c1b135e8de72")
 
     def test_get_set_from_database(self):
         value = uuid.UUID("{0609f76b-878f-4546-baf5-c1b135e8de72}")
@@ -826,7 +826,7 @@
         self.assertEqual(variable.get(), value)
         variable.set("0609f76b-878f-4546-baf5-c1b135e8de72", from_db=True)
         self.assertEqual(variable.get(), value)
-        variable.set(u"0609f76b-878f-4546-baf5-c1b135e8de72", from_db=True)
+        variable.set("0609f76b-878f-4546-baf5-c1b135e8de72", from_db=True)
         self.assertEqual(variable.get(), value)
 
         # Some other representations for UUID values.
@@ -836,7 +836,7 @@
         self.assertEqual(variable.get(), value)
 
 
-class EncodedValueVariableTestMixin(object):
+class EncodedValueVariableTestMixin:
 
     encoding = None
     variable_type = None
@@ -925,7 +925,7 @@
         # JSONVariable._dumps() works around text/bytes handling issues in
         # json.
         variable = self.variable_type()
-        variable.set({u"a": 1})
+        variable.set({"a": 1})
         self.assertTrue(isinstance(variable.get(to_db=True), str))
 
 
 
=== modified file 'storm/tests/wsgi.py'
--- storm/tests/wsgi.py	2024-03-04 10:59:55 +0000
+++ storm/tests/wsgi.py	2024-03-13 16:26:38 +0000
@@ -105,7 +105,7 @@
             self.assertEqual(timeline, found_timeline)
 
 
-class FakeTimeline(object):
+class FakeTimeline:
     """A fake Timeline.
 
     We need this because we can't use plain object instances as they can't be
 
=== modified file 'storm/tests/zope/adapters.py'
--- storm/tests/zope/adapters.py	2024-03-04 10:59:55 +0000
+++ storm/tests/zope/adapters.py	2024-03-13 16:26:38 +0000
@@ -31,7 +31,7 @@
     from storm.zope.interfaces import IResultSet, ISQLObjectResultSet
 
     @implementer(ISQLObjectResultSet)
-    class TestSQLObjectResultSet(object):
+    class TestSQLObjectResultSet:
         _result_set = EmptyResultSet()
 
 
 
=== modified file 'storm/tests/zope/testing.py'
--- storm/tests/zope/testing.py	2024-03-04 10:59:55 +0000
+++ storm/tests/zope/testing.py	2024-03-13 16:26:38 +0000
@@ -53,7 +53,7 @@
         return has_transaction and has_zope_component and has_testresources
 
     def setUp(self):
-        super(ZStormResourceManagerTest, self).setUp()
+        super().setUp()
         package_dir = self.makeDir()
         sys.path.append(package_dir)
         self.patch_dir = os.path.join(package_dir, "patch_package")
@@ -77,7 +77,7 @@
         global_zstorm._reset()
         del sys.modules["patch_package"]
         sys.modules.pop("patch_package.patch_1", None)
-        super(ZStormResourceManagerTest, self).tearDown()
+        super().tearDown()
 
     def test_make(self):
         """
@@ -182,7 +182,7 @@
         L{ZStormResourceManager.clean} tries to flush the stores to make sure
         that they are all in a consistent state.
         """
-        class Test(object):
+        class Test:
             __storm_table__ = "test"
             foo = Unicode()
             bar = Int(primary=True)
@@ -193,8 +193,8 @@
 
         zstorm = self.resource.make([])
         store = zstorm.get("test")
-        store.add(Test(u"data", 1))
-        store.add(Test(u"data", 2))
+        store.add(Test("data", 1))
+        store.add(Test("data", 2))
         self.assertRaises(IntegrityError, self.resource.clean, zstorm)
 
     def test_clean_delete(self):
@@ -227,7 +227,7 @@
         L{ZStormResourceManager.clean} clears the alive cache before
         aborting the transaction.
         """
-        class Test(object):
+        class Test:
             __storm_table__ = "test"
             bar = Int(primary=True)
 
@@ -405,7 +405,7 @@
         self.makeFile(path=os.path.join(self.patch_dir, "patch_2.py"),
                       content="def apply(store): pass")
 
-        class FakeStat(object):
+        class FakeStat:
             st_mtime = os.stat(self.patch_dir).st_mtime + 1
 
         stat_mock = self.mocker.replace(os.stat)
 
=== modified file 'storm/tests/zope/zstorm.py'
--- storm/tests/zope/zstorm.py	2024-03-04 10:59:55 +0000
+++ storm/tests/zope/zstorm.py	2024-03-13 16:26:38 +0000
@@ -136,8 +136,7 @@
             stores.append((name, store))
         self.assertEqual(len(stores), 3)
         self.assertEqual(set(stores),
-                         set([(None, store1), (None, store2),
-                              ("name", store3)]))
+                         {(None, store1), (None, store2), ("name", store3)})
 
     def test_get_name(self):
         store = self.zstorm.create("name", "sqlite:")
 
=== modified file 'storm/tracer.py'
--- storm/tracer.py	2024-03-04 10:59:55 +0000
+++ storm/tracer.py	2024-03-13 16:26:38 +0000
@@ -9,7 +9,7 @@
 from storm.expr import Variable
 
 
-class DebugTracer(object):
+class DebugTracer:
 
     def __init__(self, stream=None):
         if stream is None:
@@ -53,7 +53,7 @@
         self._stream.flush()
 
 
-class TimeoutTracer(object):
+class TimeoutTracer:
     """Provide a timeout facility for connections to prevent rogue operations.
 
     This tracer must be subclassed by backend-specific implementations that
@@ -141,7 +141,7 @@
                                   % self.__class__.__name__)
 
 
-class BaseStatementTracer(object):
+class BaseStatementTracer:
     """Storm tracer base class that does query interpolation."""
 
     def connection_raw_execute(self, connection, raw_cursor,
@@ -207,7 +207,7 @@
             on the connection object. If no name has been assigned, '<unknown>'
             is used instead.
         """
-        super(TimelineTracer, self).__init__()
+        super().__init__()
         self.timeline_factory = timeline_factory
         self.prefix = prefix
         # Stores the action in progress in a given thread.
 
=== modified file 'storm/twisted/testing.py'
--- storm/twisted/testing.py	2024-03-04 10:59:55 +0000
+++ storm/twisted/testing.py	2024-03-13 16:26:38 +0000
@@ -4,7 +4,7 @@
 from storm.twisted.transact import Transactor
 
 
-class FakeThreadPool(object):
+class FakeThreadPool:
     """
     A fake L{twisted.python.threadpool.ThreadPool}, running functions inside
     the main thread instead for easing tests.
@@ -21,7 +21,7 @@
         onResult(success, result)
 
 
-class FakeTransaction(object):
+class FakeTransaction:
 
     def commit(self):
         pass
 
=== modified file 'storm/twisted/transact.py'
--- storm/twisted/transact.py	2024-03-04 10:59:55 +0000
+++ storm/twisted/transact.py	2024-03-13 16:26:38 +0000
@@ -20,7 +20,7 @@
     pass
 
 
-class Transactor(object):
+class Transactor:
     """Run in a thread code that needs to interact with the database.
 
     This class makes sure that code interacting with the database is run
@@ -105,7 +105,7 @@
                 return result
 
 
-class RetryContext(object):
+class RetryContext:
     """Hold details about a function that is going to be retried.
 
     @ivar function: The function that is going to be retried.
 
=== modified file 'storm/tz.py'
--- storm/tz.py	2024-03-04 10:59:55 +0000
+++ storm/tz.py	2024-03-13 16:26:38 +0000
@@ -149,7 +149,7 @@
 
     __reduce__ = object.__reduce__
 
-class _ttinfo(object):
+class _ttinfo:
     __slots__ = ["offset", "delta", "isdst", "abbr", "isstd", "isgmt"]
 
     def __init__(self):
@@ -889,7 +889,7 @@
                 try:
                     tz = tzfile(filepath)
                     break
-                except (IOError, OSError, ValueError):
+                except (OSError, ValueError):
                     pass
         else:
             tz = tzlocal()
@@ -911,7 +911,7 @@
                 try:
                     tz = tzfile(filepath)
                     break
-                except (IOError, OSError, ValueError):
+                except (OSError, ValueError):
                     pass
             else:
                 tz = None
 
=== modified file 'storm/uri.py'
--- storm/uri.py	2024-03-04 10:59:55 +0000
+++ storm/uri.py	2024-03-13 16:26:38 +0000
@@ -23,7 +23,7 @@
 from storm.exceptions import URIError
 
 
-class URI(object):
+class URI:
     """A representation of a Uniform Resource Identifier (URI).
 
     This is intended exclusively for database connection URIs.
 
=== modified file 'storm/variables.py'
--- storm/variables.py	2024-03-04 10:59:55 +0000
+++ storm/variables.py	2024-03-13 16:26:38 +0000
@@ -54,7 +54,7 @@
 ]
 
 
-class LazyValue(object):
+class LazyValue:
     """Marker to be used as a base class on lazily evaluated values."""
     __slots__ = ()
 
@@ -79,7 +79,7 @@
 VariableFactory = partial
 
 
-class Variable(object):
+class Variable:
     """Basic representation of a database value in Python.
 
     @type column: L{storm.expr.Column}
@@ -394,7 +394,7 @@
 
     def __init__(self, *args, **kwargs):
         self._tzinfo = kwargs.pop("tzinfo", None)
-        super(DateTimeVariable, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
 
     def parse_set(self, value, from_db):
         if from_db:
@@ -579,7 +579,7 @@
     def get(self, default=None, to_db=False):
         if self._event_system is not None:
             self._event_system.hook("flush", self._detect_changes)
-        return super(MutableValueVariable, self).get(default, to_db)
+        return super().get(default, to_db)
 
     def set(self, value, from_db=False):
         if self._event_system is not None:
@@ -587,7 +587,7 @@
                 self._event_system.unhook("flush", self._detect_changes)
             else:
                 self._event_system.hook("flush", self._detect_changes)
-        super(MutableValueVariable, self).set(value, from_db)
+        super().set(value, from_db)
 
 
 class EncodedValueVariable(MutableValueVariable):
 
=== modified file 'storm/xid.py'
--- storm/xid.py	2024-03-04 10:59:55 +0000
+++ storm/xid.py	2024-03-13 16:26:38 +0000
@@ -19,7 +19,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-class Xid(object):
+class Xid:
     """
     Represent a transaction identifier compliant with the XA specification.
     """
 
=== modified file 'storm/zope/metadirectives.py'
--- storm/zope/metadirectives.py	2024-03-04 10:59:55 +0000
+++ storm/zope/metadirectives.py	2024-03-13 16:26:38 +0000
@@ -24,5 +24,5 @@
 
 class IStoreDirective(Interface):
 
-    name = TextLine(title=u"Name", description=u"Store name")
-    uri = TextLine(title=u"URI", description=u"Database URI")
+    name = TextLine(title="Name", description="Store name")
+    uri = TextLine(title="URI", description="Database URI")
 
=== modified file 'storm/zope/schema.py'
--- storm/zope/schema.py	2024-03-04 10:59:55 +0000
+++ storm/zope/schema.py	2024-03-13 16:26:38 +0000
@@ -24,7 +24,7 @@
 from storm.schema import Schema
 
 
-class ZCommitter(object):
+class ZCommitter:
     """A L{Schema} committer that uses Zope's transaction manager."""
 
     def commit(self):
@@ -39,5 +39,4 @@
 
     def __init__(self, creates, drops, deletes, patch_package):
         committer = ZCommitter()
-        super(ZSchema, self).__init__(creates, drops, deletes, patch_package,
-                                      committer)
+        super().__init__(creates, drops, deletes, patch_package, committer)
 
=== modified file 'storm/zope/testing.py'
--- storm/zope/testing.py	2024-03-04 10:59:55 +0000
+++ storm/zope/testing.py	2024-03-13 16:26:38 +0000
@@ -70,7 +70,7 @@
     vertical_patching = True
 
     def __init__(self, databases):
-        super(ZStormResourceManager, self).__init__()
+        super().__init__()
         self._databases = databases
         self._zstorm = None
         self._schema_zstorm = None
 
=== modified file 'storm/zope/zstorm.py'
--- storm/zope/zstorm.py	2024-03-04 10:59:55 +0000
+++ storm/zope/zstorm.py	2024-03-13 16:26:38 +0000
@@ -45,7 +45,7 @@
 
 
 @implementer(IZStorm)
-class ZStorm(object):
+class ZStorm:
     """A utility which integrates Storm with Zope.
 
     Typically, applications will register stores using ZCML similar
@@ -255,7 +255,7 @@
 
 
 @implementer(IDataManager)
-class StoreDataManager(object):
+class StoreDataManager:
     """An L{IDataManager} implementation for C{ZStorm}."""
 
     def __init__(self, store, zstorm):