Merge lp:~cjwatson/storm/remove-py2 into lp:storm

[Colin Watson]

Remove Python 2 support.

We've offered several releases of overlap (Storm gained Python 3 support in version 0.21, released on 2019-09-20). There are no known users left on Python 2, and if there were any then they'd probably need to pin old versions of quite a few other dependencies anyway.

I considered breaking this up into smaller MPs, but since it's mostly removals it's probably better to just get it over with in one go. To keep the size somewhat under control, I restrained myself from doing further tidy-ups that pyupgrade would take care of for us, and mostly stuck to simple removals of future imports and getting rid of more explicit `six`-based Python 2 compatibility code.

It seems reasonable to bump to 1.0 at this point.

[Guruprasad (lgp171188)]

Thank you for this contribution, Colin! I reviewed the changes and they look good to me. 👍

review: Approve

[lp:~cjwatson/storm/remove-py2]

582. By Colin Watson on 2024-03-04

Remove Python 2 support.

We've offered several releases of overlap (Storm gained Python 3 support
in version 0.21, released on 2019-09-20). There are no known users left
on Python 2, and if there were any then they'd probably need to pin old
versions of quite a few other dependencies anyway.

=== modified file 'NEWS'
--- NEWS	2023-12-07 17:04:46 +0000
+++ NEWS	2024-03-04 10:59:33 +0000
@@ -1,11 +1,19 @@
-0.27
-====
+1.0
+===
 
 Improvements
 ------------
 
 - Fix several syntax warnings from recent Python versions.
 
+API changes
+-----------
+
+- Remove support for Python 2.
+- Remove the storm.compat module.
+- Deprecate storm.sqlobject.AutoUnicodeVariable and
+  storm.sqlobject.AutoUnicode.
+
 0.26 (2023-07-04)
 =================
 

=== modified file 'README'
--- README	2021-04-06 09:23:02 +0000
+++ README	2024-03-04 10:59:33 +0000
@@ -116,19 +116,18 @@
 
 These will take a few minutes to download.
 
-The Python dependencies for running tests can mostly be installed with
-apt-get:
+The Python dependencies for running tests can be installed with apt-get:
 
  $ apt-get install \
-       python-fixtures python-psycopg2 \
-       python-testresources python-transaction python-twisted \
-       python-zope.component python-zope.security
-
-Two modules - pgbouncer and timeline - are not yet packaged in
-Ubuntu. These can be installed from PyPI:
-
-  http://pypi.python.org/pypi/pgbouncer
-  http://pypi.python.org/pypi/timeline
+       python3-fixtures \
+       python3-pgbouncer \
+       python3-psycopg2 \
+       python3-testresources \
+       python3-timeline \
+       python3-transaction \
+       python3-twisted \
+       python3-zope.component \
+       python3-zope.security
 
 Alternatively, dependencies can be downloaded as eggs into the current
 directory with:

=== modified file 'dev/test'
--- dev/test	2021-05-13 23:02:23 +0000
+++ dev/test	2024-03-04 10:59:33 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # Copyright (c) 2006, 2007 Canonical
 #
@@ -87,7 +87,7 @@
     except ImportError:
         return runner_func
 
-    from six.moves.urllib.parse import urlunsplit
+    from urllib.parse import urlunsplit
     from storm.uri import escape
 
     def wrapper():
@@ -128,7 +128,7 @@
     except ImportError:
         return runner_func
 
-    from six.moves.urllib.parse import (
+    from urllib.parse import (
         urlencode,
         urlunsplit,
         )

=== modified file 'dev/ubuntu-deps'
--- dev/ubuntu-deps	2021-04-06 09:23:02 +0000
+++ dev/ubuntu-deps	2024-03-04 10:59:33 +0000
@@ -12,17 +12,18 @@
     mysql-server \
     pgbouncer \
     postgresql \
-    python-dev \
-    python-fixtures \
-    python-mysqldb \
-    python-psycopg2 \
-    python-setuptools \
-    python-six \
-    python-testresources \
-    python-transaction \
-    python-twisted \
-    python-zope.component \
-    python-zope.security \
+    python3-dev \
+    python3-fixtures \
+    python3-mysqldb \
+    python3-pgbouncer \
+    python3-psycopg2 \
+    python3-setuptools \
+    python3-testresources \
+    python3-timeline \
+    python3-transaction \
+    python3-twisted \
+    python3-zope.component \
+    python3-zope.security \
     tox
 
 

=== modified file 'setup.py'
--- setup.py	2022-10-28 06:26:28 +0000
+++ setup.py	2024-03-04 10:59:33 +0000
@@ -1,6 +1,4 @@
-#!/usr/bin/env python
-
-from __future__ import print_function
+#!/usr/bin/env python3
 
 import os
 import re
@@ -26,17 +24,14 @@
 tests_require = [
     "fixtures >= 1.3.0",
     "mysqlclient",
-    "mysqlclient < 2.0.0; python_version < '3'",
     "pgbouncer >= 0.0.7",
     "postgresfixture",
     "psycopg2 >= 2.3.0",
-    "setuptools < 45; python_version < '3'",
     "testresources >= 0.2.4",
     "testtools >= 0.9.8",
     "timeline >= 0.0.2",
     "transaction >= 1.0.0",
     "Twisted >= 10.0.0",
-    "Twisted < 21.2.0; python_version < '3'",
     "zope.component >= 3.8.0",
     "zope.configuration",
     "zope.interface >= 4.0.0",
@@ -67,8 +62,6 @@
         ("License :: OSI Approved :: GNU Library or "
          "Lesser General Public License (LGPL)"),
         "Programming Language :: Python",
-        "Programming Language :: Python :: 2",
-        "Programming Language :: Python :: 2.7",
         "Programming Language :: Python :: 3",
         "Programming Language :: Python :: 3.5",
         "Programming Language :: Python :: 3.6",
@@ -87,7 +80,7 @@
     # warning) by distutils.
     include_package_data=True,
     zip_safe=False,
-    install_requires=["six"],
+    python_requires=">=3.5",
     test_suite="storm.tests.find_tests",
     tests_require=tests_require,
     extras_require={

=== modified file 'storm/__init__.py'
--- storm/__init__.py	2023-07-04 13:55:37 +0000
+++ storm/__init__.py	2024-03-04 10:59:33 +0000
@@ -19,8 +19,6 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-from __future__ import print_function
-
 import os
 
 

=== modified file 'storm/base.py'
--- storm/base.py	2019-08-11 08:58:54 +0000
+++ storm/base.py	2024-03-04 10:59:33 +0000
@@ -18,17 +18,13 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-from __future__ import print_function
-
-import six
-
 from storm.properties import PropertyPublisherMeta
 
 
 __all__ = ["Storm"]
 
 
-class Storm(six.with_metaclass(PropertyPublisherMeta, object)):
+class Storm(metaclass=PropertyPublisherMeta):
     """An optional base class for objects stored in a Storm Store.
 
     It causes your subclasses to be associated with a Storm

=== modified file 'storm/cache.py'
--- storm/cache.py	2023-12-07 17:04:46 +0000
+++ storm/cache.py	2024-03-04 10:59:33 +0000
@@ -1,9 +1,5 @@
-from __future__ import print_function
-
 import itertools
 
-import six
-
 
 class Cache(object):
     """Prevents recently used objects from being deallocated.
@@ -145,8 +141,8 @@
         """
         self._size = size
         cache = itertools.islice(
-            itertools.chain(six.iteritems(self._new_cache),
-                            six.iteritems(self._old_cache)),
+            itertools.chain(self._new_cache.items(),
+                            self._old_cache.items()),
             0, size)
         self._new_cache = dict(cache)
         self._old_cache.clear()

=== modified file 'storm/cextensions.c'
--- storm/cextensions.c	2022-03-16 16:59:21 +0000
+++ storm/cextensions.c	2024-03-04 10:59:33 +0000
@@ -24,16 +24,6 @@
 #include <structmember.h>
 
 
-#if PY_VERSION_HEX >= 0x03000000
-#define PyInt_FromLong PyLong_FromLong
-#define PyText_AsString _PyUnicode_AsString
-#define PyString_Check(o) 0
-#define PyString_CheckExact(o) 0
-#else
-/* 2.x */
-#define PyText_AsString PyString_AsString
-#endif
-
 #define CATCH(error_value, expression) \
         do { \
             if ((expression) == error_value) {\
@@ -1423,7 +1413,7 @@
     PyObject *result = PyDict_GetItem(self->_precedence, type);
     if (result == NULL && !PyErr_Occurred()) {
         /* That should be MAX_PRECEDENCE, defined in expr.py */
-        return PyInt_FromLong(1000);
+        return PyLong_FromLong(1000);
     }
     Py_INCREF(result);
     return result;
@@ -1511,7 +1501,7 @@
             if (repr) {
                 PyErr_Format(CompileError,
                              "Don't know how to compile type %s of %s",
-                             expr->ob_type->tp_name, PyText_AsString(repr));
+                             expr->ob_type->tp_name, _PyUnicode_AsString(repr));
                 Py_DECREF(repr);
             }
             goto error;
@@ -1570,24 +1560,20 @@
 
     /*
       expr_type = type(expr)
-      string_types = (str,) if six.PY3 else (str, unicode)
-      if expr_type is SQLRaw or (raw and expr_type in string_types):
+      if expr_type is SQLRaw or (raw and expr_type is str):
           return expr
     */
-    /* Note that PyString_CheckExact(o) is defined at the top of this file
-       to 0 on Python 3, so we can safely translate the string_types checks
-       here to PyString_CheckExact || PyUnicode_CheckExact. */
     if ((PyObject *)expr->ob_type == SQLRaw ||
-        (raw && (PyString_CheckExact(expr) || PyUnicode_CheckExact(expr)))) {
+        (raw && PyUnicode_CheckExact(expr))) {
         /* Pass our reference on. */
         return expr;
     }
 
     /*
-       if token and expr_type in string_types:
+       if token and expr_type is str:
            expr = SQLToken(expr)
     */
-    if (token && (PyString_CheckExact(expr) || PyUnicode_CheckExact(expr))) {
+    if (token && PyUnicode_CheckExact(expr)) {
         PyObject *tmp;
         CATCH(NULL, tmp = PyObject_CallFunctionObjArgs(SQLToken, expr, NULL));
         Py_DECREF(expr);
@@ -1614,12 +1600,10 @@
             PyObject *subexpr = PySequence_Fast_GET_ITEM(sequence, i);
             /*
                subexpr_type = type(subexpr)
-               if (subexpr_type is SQLRaw or
-                       (raw and subexpr_type in string_types)):
+               if subexpr_type is SQLRaw or (raw and subexpr_type is str):
             */
             if ((PyObject *)subexpr->ob_type == (PyObject *)SQLRaw ||
-                (raw && (PyString_CheckExact(subexpr) ||
-                         PyUnicode_CheckExact(subexpr)))) {
+                (raw && PyUnicode_CheckExact(subexpr))) {
                 /* statement = subexpr */
                 Py_INCREF(subexpr);
                 statement = subexpr;
@@ -1636,10 +1620,9 @@
             /* else: */
             } else {
                 /*
-                   if token and subexpr_type in string_types:
+                   if token and subexpr_type is str:
                 */
-                if (token && (PyUnicode_CheckExact(subexpr) ||
-                              PyString_CheckExact(subexpr))) {
+                if (token && PyUnicode_CheckExact(subexpr)) {
                     /* subexpr = SQLToken(subexpr) */
                     CATCH(NULL,
                           subexpr = PyObject_CallFunctionObjArgs(SQLToken,
@@ -1713,7 +1696,7 @@
                                      &expr, &state, &join, &raw, &token)) {
         return NULL;
     }
-    if (join && (!PyString_Check(join) && !PyUnicode_Check(join))) {
+    if (join && !PyUnicode_Check(join)) {
         PyErr_Format(PyExc_TypeError,
                      "'join' argument must be a string, not %.80s",
                      Py_TYPE(join)->tp_name);
@@ -1949,7 +1932,7 @@
     PyObject *column, *variable, *tmp;
     Py_ssize_t i = 0;
 
-    /* for variable in six.itervalues(self.variables): */
+    /* for variable in self.variables.values(): */
     while (PyDict_Next(self->variables, &i, &column, &variable)) {
         /* variable.checkpoint() */
         CATCH(NULL, tmp = PyObject_CallMethod(variable, "checkpoint", NULL));
@@ -2180,16 +2163,6 @@
     return 0;
 }
 
-#if PY_VERSION_HEX < 0x03000000
-DL_EXPORT(void)
-initcextensions(void)
-{
-    PyObject *module;
-
-    module = Py_InitModule3("cextensions", cextensions_methods, "");
-    do_init(module);
-}
-#else
 static struct PyModuleDef cextensionsmodule = {
     PyModuleDef_HEAD_INIT,
     "cextensions",
@@ -2211,7 +2184,6 @@
     do_init(module);
     return module;
 }
-#endif
 
 
 /* vim:ts=4:sw=4:et

=== removed file 'storm/compat.py'
--- storm/compat.py	2019-06-05 11:41:07 +0000
+++ storm/compat.py	1970-01-01 00:00:00 +0000
@@ -1,27 +0,0 @@
-#
-# Copyright (c) 2011 Canonical
-#
-# Written by Gustavo Niemeyer <[e-mail]>
-#
-# This file is part of Storm Object Relational Mapper.
-#
-# Storm is free software; you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License as
-# published by the Free Software Foundation; either version 2.1 of
-# the License, or (at your option) any later version.
-#
-# Storm is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-
-from __future__ import print_function
-
-__all__ = ["json"]
-
-
-import json

=== modified file 'storm/database.py'
--- storm/database.py	2023-12-07 17:04:46 +0000
+++ storm/database.py	2024-03-04 10:59:33 +0000
@@ -25,16 +25,9 @@
 supported in modules in L{storm.databases}.
 """
 
-from __future__ import print_function
-
-try:
-    from collections.abc import Callable
-except ImportError:
-    from collections import Callable
+from collections.abc import Callable
 from functools import wraps
 
-import six
-
 from storm.expr import Expr, State, compile
 # Circular import: imported at the end of the module.
 # from storm.tracer import trace
@@ -690,7 +683,7 @@
         Where 'anything' has previously been registered with
         L{register_scheme}.
     """
-    if isinstance(uri, six.string_types):
+    if isinstance(uri, str):
         uri = URI(uri)
     if uri.scheme in _database_schemes:
         factory = _database_schemes[uri.scheme]

=== modified file 'storm/databases/__init__.py'
--- storm/databases/__init__.py	2019-08-11 09:07:34 +0000
+++ storm/databases/__init__.py	2024-03-04 10:59:33 +0000
@@ -19,10 +19,6 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-from __future__ import print_function
-
-import six
-
 
 class Dummy(object):
     """Magic "infectious" class.
@@ -43,7 +39,4 @@
     def __bool__(self):
         return False
 
-    if six.PY2:
-        __nonzero__ = __bool__
-
 dummy = Dummy()

=== modified file 'storm/databases/mysql.py'
--- storm/databases/mysql.py	2021-05-13 23:02:23 +0000
+++ storm/databases/mysql.py	2024-03-04 10:59:33 +0000
@@ -19,8 +19,6 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-from __future__ import print_function
-
 from datetime import time, timedelta
 from array import array
 import sys

=== modified file 'storm/databases/postgres.py'
--- storm/databases/postgres.py	2019-09-17 09:35:10 +0000
+++ storm/databases/postgres.py	2024-03-04 10:59:33 +0000
@@ -19,8 +19,6 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-from __future__ import print_function
-
 from datetime import datetime, date, time, timedelta
 import json
 

=== modified file 'storm/databases/sqlite.py'
--- storm/databases/sqlite.py	2020-02-10 15:30:23 +0000
+++ storm/databases/sqlite.py	2024-03-04 10:59:33 +0000
@@ -18,14 +18,10 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-from __future__ import print_function
-
 from datetime import datetime, date, time, timedelta
 from time import sleep, time as now
 import sys
 
-import six
-
 from storm.databases import dummy
 
 try:
@@ -85,26 +81,11 @@
 
     @staticmethod
     def set_variable(variable, value):
-        if (isinstance(variable, BytesVariable) and
-                isinstance(value, six.text_type)):
+        if isinstance(variable, BytesVariable) and isinstance(value, str):
             # pysqlite2 may return unicode.
             value = value.encode("UTF-8")
         variable.set(value, from_db=True)
 
-    @staticmethod
-    def from_database(row):
-        """Convert SQLite-specific datatypes to "normal" Python types.
-
-        On Python 2, if there are any C{buffer} instances in the row,
-        convert them to bytes.  On Python 3, BLOB types are converted to
-        bytes, which is already what we want.
-        """
-        for value in row:
-            if six.PY2 and isinstance(value, buffer):
-                yield bytes(value)
-            else:
-                yield value
-
 
 class SQLiteConnection(Connection):
 
@@ -116,16 +97,13 @@
     def to_database(params):
         """
         Like L{Connection.to_database}, but this also converts
-        instances of L{datetime} types to strings, and (on Python 2) bytes
-        instances to C{buffer} instances.
+        instances of L{datetime} types to strings.
         """
         for param in params:
             if isinstance(param, Variable):
                 param = param.get(to_db=True)
             if isinstance(param, (datetime, date, time, timedelta)):
                 yield str(param)
-            elif six.PY2 and isinstance(param, bytes):
-                yield buffer(param)
             else:
                 yield param
 

=== modified file 'storm/event.py'
--- storm/event.py	2020-05-29 22:08:47 +0000
+++ storm/event.py	2024-03-04 10:59:33 +0000
@@ -18,8 +18,6 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-from __future__ import print_function
-
 import weakref
 
 from storm import has_cextensions

=== modified file 'storm/exceptions.py'
--- storm/exceptions.py	2021-05-13 23:23:17 +0000
+++ storm/exceptions.py	2024-03-04 10:59:33 +0000
@@ -18,13 +18,9 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-from __future__ import print_function
-
 from contextlib import contextmanager
 import sys
 
-import six
-
 
 class StormError(Exception):
     pass
@@ -171,18 +167,12 @@
         for wrapper_type in _wrapped_exception_types:
             dbapi_type = getattr(module, wrapper_type.__name__, None)
             if (dbapi_type is not None and
-                    isinstance(dbapi_type, six.class_types) and
+                    isinstance(dbapi_type, type) and
                     isinstance(e, dbapi_type)):
                 wrapped = database._wrap_exception(wrapper_type, e)
                 tb = sys.exc_info()[2]
-                # As close to "raise wrapped.with_traceback(tb) from e" as
-                # we can manage, but without causing syntax errors on
-                # various versions of Python.
                 try:
-                    if six.PY2:
-                        six.reraise(wrapped, None, tb)
-                    else:
-                        six.raise_from(wrapped.with_traceback(tb), e)
+                    raise wrapped.with_traceback(tb) from e
                 finally:
                     # Avoid traceback reference cycles.
                     del wrapped, tb

=== modified file 'storm/expr.py'
--- storm/expr.py	2022-10-18 17:36:05 +0000
+++ storm/expr.py	2024-03-04 10:59:33 +0000
@@ -18,16 +18,12 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-from __future__ import print_function
-
 from decimal import Decimal
 from datetime import datetime, date, time, timedelta
 from weakref import WeakKeyDictionary
 from copy import copy
 import re
 
-import six
-
 from storm.exceptions import CompileError, NoTableError, ExprError
 from storm.variables import (
     Variable, BytesVariable, UnicodeVariable, LazyValue,
@@ -157,23 +153,20 @@
             created internally (and thus can't be accessed).
         @param join: The string token to use to put between
             subexpressions. Defaults to ", ".
-        @param raw: If true, any string (str or unicode on Python 2, str on
-            Python 3) expression or subexpression will not be further
-            compiled.
-        @param token: If true, any string (str or unicode on Python 2, str
-            on Python 3) expression will be considered as a SQLToken, and
-            quoted properly.
+        @param raw: If true, any string expression or subexpression will not
+            be further compiled.
+        @param token: If true, any string expression will be considered as a
+            SQLToken, and quoted properly.
         """
         # FASTPATH This method is part of the fast path.  Be careful when
         #          changing it (try to profile any changes).
 
         expr_type = type(expr)
-        string_types = (str,) if six.PY3 else (str, unicode)
 
-        if expr_type is SQLRaw or (raw and expr_type in string_types):
+        if expr_type is SQLRaw or (raw and expr_type is str):
             return expr
 
-        if token and expr_type in string_types:
+        if token and expr_type is str:
             expr = SQLToken(expr)
 
         if state is None:
@@ -184,14 +177,13 @@
             compiled = []
             for subexpr in expr:
                 subexpr_type = type(subexpr)
-                if (subexpr_type is SQLRaw or
-                        (raw and subexpr_type in string_types)):
+                if subexpr_type is SQLRaw or (raw and subexpr_type is str):
                     statement = subexpr
                 elif subexpr_type is tuple or subexpr_type is list:
                     state.precedence = outer_precedence
                     statement = self(subexpr, state, join, raw, token)
                 else:
-                    if token and subexpr_type in string_types:
+                    if token and subexpr_type is str:
                         subexpr = SQLToken(subexpr)
                     statement = self._compile_single(subexpr, state,
                                                      outer_precedence)
@@ -313,12 +305,12 @@
     state.parameters.append(BytesVariable(expr))
     return "?"
 
[e-mail](six.text_type)
[e-mail](str)
 def compile_text(compile, expr, state):
     state.parameters.append(UnicodeVariable(expr))
     return "?"
 
[e-mail](*six.integer_types)
[e-mail](int)
 def compile_int(compile, expr, state):
     state.parameters.append(IntVariable(expr))
     return "?"
@@ -363,8 +355,7 @@
     return "NULL"
 
 
-@compile_python.when(
-    bytes, six.text_type, float, type(None), *six.integer_types)
+@compile_python.when(bytes, str, int, float, type(None))
 def compile_python_builtin(compile, expr, state):
     return repr(expr)
 
@@ -518,19 +509,19 @@
         return Upper(self)
 
     def startswith(self, prefix, case_sensitive=None):
-        if not isinstance(prefix, six.text_type):
+        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)
 
     def endswith(self, suffix, case_sensitive=None):
-        if not isinstance(suffix, six.text_type):
+        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)
 
     def contains_string(self, substring, case_sensitive=None):
-        if not isinstance(substring, six.text_type):
+        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)
@@ -746,7 +737,7 @@
     state.context = EXPR
     values = insert.values
     if values is Undef:
-        values = [tuple(six.itervalues(insert.map))]
+        values = [tuple(insert.map.values())]
     if isinstance(values, Expr):
         compiled_values = compile(values, state)
     else:
@@ -1492,7 +1483,7 @@
 # --------------------------------------------------------------------
 # Plain SQL expressions.
 
-class SQLRaw(six.text_type):
+class SQLRaw(str):
     """Subtype to mark a string as something that shouldn't be compiled.
 
     This is handled internally by the compiler.
@@ -1500,7 +1491,7 @@
     __slots__ = ()
 
 
-class SQLToken(six.text_type):
+class SQLToken(str):
     """Marker for strings that should be considered as a single SQL token.
 
     These strings will be quoted, when needed.

=== modified file 'storm/info.py'
--- storm/info.py	2020-05-26 10:37:54 +0000
+++ storm/info.py	2024-03-04 10:59:33 +0000
@@ -18,12 +18,8 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-from __future__ import print_function
-
 from weakref import ref
 
-import six
-
 from storm.exceptions import ClassInfoError
 from storm.expr import Column, Desc, TABLE
 from storm.expr import compile, Table
@@ -77,7 +73,7 @@
 
         self.cls = cls
 
-        if isinstance(self.table, six.string_types):
+        if isinstance(self.table, str):
             self.table = Table(self.table)
 
         pairs = []
@@ -135,7 +131,7 @@
                 __order__ = (__order__,)
             self.default_order = []
             for item in __order__:
-                if isinstance(item, six.string_types):
+                if isinstance(item, str):
                     if item.startswith("-"):
                         prop = Desc(getattr(cls, item[1:]))
                     else:
@@ -198,7 +194,7 @@
         self.event.emit("object-deleted")
 
     def checkpoint(self):
-        for variable in six.itervalues(self.variables):
+        for variable in self.variables.values():
             variable.checkpoint()
 
 

=== modified file 'storm/locals.py'
--- storm/locals.py	2020-02-10 15:30:23 +0000
+++ storm/locals.py	2024-03-04 10:59:33 +0000
@@ -18,8 +18,6 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-from __future__ import print_function
-
 from storm.properties import Bool, Int, Float, Bytes, RawStr, Chars, Unicode
 from storm.properties import List, Decimal, DateTime, Date, Time, Enum, UUID
 from storm.properties import TimeDelta, Pickle, JSON

=== modified file 'storm/properties.py'
--- storm/properties.py	2020-05-26 16:14:13 +0000
+++ storm/properties.py	2024-03-04 10:59:33 +0000
@@ -18,8 +18,6 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-from __future__ import print_function
-
 from bisect import insort_left, bisect_left
 import weakref
 import sys
@@ -211,8 +209,8 @@
 class Bytes(SimpleProperty):
     """Bytes property.
 
-    This accepts L{bytes}, L{buffer} (Python 2), or L{memoryview} (Python 3)
-    objects, and stores them as byte strings.
+    This accepts L{bytes} or L{memoryview} objects, and stores them as byte
+    strings.
 
     Deprecated aliases: L{Chars}, L{RawStr}.
     """
@@ -228,9 +226,7 @@
 class Unicode(SimpleProperty):
     """Unicode property.
 
-    This accepts L{unicode} (Python 2) or L{str} (Python 3) objects, and
-    stores them as text strings.  Note that it does not accept L{str}
-    objects on Python 2.
+    This accepts L{str} objects, and stores them as text strings.
     """
     variable_class = UnicodeVariable
 

=== modified file 'storm/references.py'
--- storm/references.py	2020-05-26 16:32:10 +0000
+++ storm/references.py	2024-03-04 10:59:33 +0000
@@ -18,12 +18,8 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-from __future__ import print_function
-
 import weakref
 
-import six
-
 from storm.exceptions import (
     ClassInfoError, FeatureError, NoStoreError, WrongStoreError)
 from storm.store import Store, get_where_for_args, LostObjectError
@@ -985,7 +981,7 @@
     def resolve_one(self, property):
         if type(property) is tuple:
             return self.resolve(property)
-        elif isinstance(property, six.string_types):
+        elif isinstance(property, str):
             return self._resolve_string(property)
         elif isinstance(property, SuffixExpr):
             # XXX This covers cases like order_by=Desc("Bar.id"), see #620369.
@@ -1013,14 +1009,14 @@
 
 def _find_descriptor_class(used_cls, descr):
     for cls in used_cls.__mro__:
-        for attr, _descr in six.iteritems(cls.__dict__):
+        for attr, _descr in cls.__dict__.items():
             if _descr is descr:
                 return cls
     raise RuntimeError("Reference used in an unknown class")
 
 def _find_descriptor_obj(used_cls, descr):
     for cls in used_cls.__mro__:
-        for attr, _descr in six.iteritems(cls.__dict__):
+        for attr, _descr in cls.__dict__.items():
             if _descr is descr:
                 return getattr(cls, attr)
     raise RuntimeError("Reference used in an unknown class")

=== modified file 'storm/schema/__init__.py'
--- storm/schema/__init__.py	2019-06-05 11:41:07 +0000
+++ storm/schema/__init__.py	2024-03-04 10:59:33 +0000
@@ -18,6 +18,4 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-from __future__ import print_function
-
 from storm.schema.schema import Schema

=== modified file 'storm/schema/patch.py'
--- storm/schema/patch.py	2019-08-11 10:08:24 +0000
+++ storm/schema/patch.py	2024-03-04 10:59:33 +0000
@@ -34,15 +34,11 @@
 'patch' table in the given L{Store}, and it won't be applied again.
 """
 
-from __future__ import print_function
-
 import sys
 import os
 import re
 import types
 
-import six
-
 from storm.locals import StormError, Int
 
 
@@ -122,12 +118,10 @@
         except:
             type, value, traceback = sys.exc_info()
             patch_repr = getattr(module, "__file__", version)
-            six.reraise(
-                BadPatchError,
-                BadPatchError(
-                    "Patch %s failed: %s: %s" %
-                    (patch_repr, type.__name__, str(value))),
-                traceback)
+            raise BadPatchError(
+                "Patch %s failed: %s: %s" %
+                (patch_repr, type.__name__, str(value))
+            ).with_traceback(traceback)
         self._committer.commit()
 
     def apply_all(self):

=== modified file 'storm/schema/schema.py'
--- storm/schema/schema.py	2019-06-05 11:41:07 +0000
+++ storm/schema/schema.py	2024-03-04 10:59:33 +0000
@@ -43,8 +43,6 @@
 upgrade the schema over time.
 """
 
-from __future__ import print_function
-
 import types
 
 from storm.locals import StormError

=== modified file 'storm/schema/sharding.py'
--- storm/schema/sharding.py	2019-06-05 11:41:07 +0000
+++ storm/schema/sharding.py	2024-03-04 10:59:33 +0000
@@ -41,8 +41,6 @@
 be at the same patch level. See L{storm.schema.patch.PatchSet}.
 """
 
-from __future__ import print_function
-
 from storm.schema.schema import SchemaMissingError, UnappliedPatchesError
 
 

=== modified file 'storm/sqlobject.py'
--- storm/sqlobject.py	2020-02-10 15:30:23 +0000
+++ storm/sqlobject.py	2024-03-04 10:59:33 +0000
@@ -23,18 +23,14 @@
 L{SQLObjectBase} is the central point of compatibility.
 """
 
-from __future__ import print_function
-
 import re
 import warnings
 
-import six
-
 from storm.properties import (
     Bytes, Int, Bool, Float, DateTime, Date, TimeDelta)
 from storm.references import Reference, ReferenceSet
 from storm.properties import SimpleProperty, PropertyPublisherMeta
-from storm.variables import Variable
+from storm.variables import UnicodeVariable
 from storm.exceptions import StormError, NotOneError
 from storm.info import get_cls_info, ClassAlias
 from storm.store import AutoReload, Store
@@ -166,7 +162,7 @@
         dict["__storm_table__"] = table_name
 
         attr_to_prop = {}
-        for attr, prop in list(six.iteritems(dict)):
+        for attr, prop in list(dict.items()):
             if attr == "__classcell__":  # Python >= 3.6
                 continue
             attr_to_prop[attr] = attr
@@ -211,7 +207,7 @@
 
 
         id_type = dict.setdefault("_idType", int)
-        id_cls = {int: Int, bytes: Bytes, six.text_type: AutoUnicode}[id_type]
+        id_cls = {int: Int, bytes: Bytes, str: AutoUnicode}[id_type]
         dict["id"] = id_cls(id_name, primary=True, default=AutoReload)
         attr_to_prop[id_name] = "id"
 
@@ -228,7 +224,7 @@
         property_registry.add_property(obj, getattr(obj, "id"),
                                        "<table %s>" % table_name)
 
-        for fake_name, real_name in list(six.iteritems(attr_to_prop)):
+        for fake_name, real_name in list(attr_to_prop.items()):
             prop = getattr(obj, real_name)
             if fake_name != real_name:
                 property_registry.add_property(obj, prop, fake_name)
@@ -265,7 +261,7 @@
             return getattr(self._cls, attr)
 
 
-class SQLObjectBase(six.with_metaclass(SQLObjectMeta, Storm)):
+class SQLObjectBase(Storm, metaclass=SQLObjectMeta):
     """The root class of all SQLObject-emulating classes in your application.
 
     The general strategy for using Storm's SQLObject emulation layer
@@ -301,7 +297,7 @@
         self._init(None)
 
     def set(self, **kwargs):
-        for attr, value in six.iteritems(kwargs):
+        for attr, value in kwargs.items():
             setattr(self, attr, value)
 
     def destroySelf(self):
@@ -334,7 +330,7 @@
         if not isinstance(orderBy, (tuple, list)):
             orderBy = (orderBy,)
         for item in orderBy:
-            if isinstance(item, six.string_types):
+            if isinstance(item, str):
                 desc = item.startswith("-")
                 if desc:
                     item = item[1:]
@@ -409,7 +405,7 @@
 
     def _copy(self, **kwargs):
         copy = self.__class__(self._cls, **kwargs)
-        for name, value in six.iteritems(self.__dict__):
+        for name, value in self.__dict__.items():
             if name[1:] not in kwargs and name != "_finished_result_set":
                 setattr(copy, name, value)
         return copy
@@ -562,9 +558,6 @@
         """
         return not self.is_empty()
 
-    if six.PY2:
-        __nonzero__ = __bool__
-
     def is_empty(self):
         """Return C{True} if this result set doesn't contain any results."""
         result_set = self._without_prejoins()._result_set
@@ -611,7 +604,7 @@
         return self._copy(prejoinClauseTables=prejoinClauseTables)
 
     def sum(self, attribute):
-        if isinstance(attribute, six.string_types):
+        if isinstance(attribute, str):
             attribute = SQL(attribute)
         result_set = self._without_prejoins()._result_set
         return result_set.sum(attribute)
@@ -682,23 +675,13 @@
                                               **self._kwargs)
 
 
-class AutoUnicodeVariable(Variable):
-    """A more relaxed version of UnicodeVariable that accepts native strings.
-
-    On Python 2, this will try to convert bytes to text, to make it easier
-    to port code from SQLObject that expects to be able to set this variable
-    to a native string.
-
-    On Python 3, this behaves the same way as UnicodeVariable and only
-    accepts text, since native strings are already Unicode.
-    """
-    __slots__ = ()
-
-    def parse_set(self, value, from_db):
-        if not isinstance(value, six.string_types):
-            raise TypeError("Expected a string type, found %r" % type(value))
-        return six.text_type(value)
-
+# DEPRECATED: On Python 2, this used to be a more relaxed version of
+# UnicodeVariable that accepted both bytes and text.  On Python 3, it
+# accepts only text and is thus the same as UnicodeVariable.  It exists only
+# for compatibility.
+AutoUnicodeVariable = UnicodeVariable
+
+# DEPRECATED: Use storm.properties.Unicode instead.
 class AutoUnicode(SimpleProperty):
     variable_class = AutoUnicodeVariable
 

=== modified file 'storm/store.py'
--- storm/store.py	2023-12-07 17:04:46 +0000
+++ storm/store.py	2024-03-04 10:59:33 +0000
@@ -24,14 +24,10 @@
 This module contains the highest-level ORM interface in Storm.
 """
 
-from __future__ import print_function
-
 from copy import copy
 from weakref import WeakValueDictionary
 from operator import itemgetter
 
-import six
-
 from storm.info import get_cls_info, get_obj_info, set_obj_info
 from storm.variables import Variable, LazyValue
 from storm.expr import (
@@ -479,7 +475,7 @@
         self._dirty = flushing
 
         predecessors = {}
-        for (before_info, after_info), n in six.iteritems(self._order):
+        for (before_info, after_info), n in self._order.items():
             if n > 0:
                 before_set = predecessors.get(after_info)
                 if before_set is None:
@@ -858,7 +854,7 @@
             del obj_info["primary_vars"]
 
     def _iter_alive(self):
-        return list(six.itervalues(self._alive))
+        return list(self._alive.values())
 
     def _enable_change_notification(self, obj_info):
         obj_info.event.emit("start-tracking-changes", self._event)
@@ -1012,7 +1008,7 @@
             L{ResultSet} will be returned appropriately modified with
             C{OFFSET} and C{LIMIT} clauses.
         """
-        if isinstance(index, six.integer_types):
+        if isinstance(index, int):
             if index == 0:
                 result_set = self
             else:
@@ -1411,7 +1407,7 @@
                     for column in changes:
                         obj_info.variables[column].set(AutoReload)
         else:
-            changes = list(six.iteritems(changes))
+            changes = list(changes.items())
             for obj in cached:
                 for column, value in changes:
                     variables = get_obj_info(obj).variables

=== modified file 'storm/testing.py'
--- storm/testing.py	2020-05-26 15:55:53 +0000
+++ storm/testing.py	2024-03-04 10:59:33 +0000
@@ -1,5 +1,3 @@
-from __future__ import print_function
-
 from fixtures import Fixture
 
 from storm.tracer import BaseStatementTracer, install_tracer, remove_tracer

=== modified file 'storm/tests/__init__.py'
--- storm/tests/__init__.py	2020-05-26 10:28:24 +0000
+++ storm/tests/__init__.py	2024-03-04 10:59:33 +0000
@@ -19,8 +19,6 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-from __future__ import print_function
-
 __all__ = [
     'find_tests',
     'has_fixtures',
@@ -116,7 +114,6 @@
                             os.path.basename(relpath),
                             module_relative=True,
                             package=parent_module,
-                            globs={"print_function": print_function},
                             optionflags=doctest.ELLIPSIS))
 
     return suite

=== modified file 'storm/tests/base.py'
--- storm/tests/base.py	2019-11-21 16:06:52 +0000
+++ storm/tests/base.py	2024-03-04 10:59:33 +0000
@@ -18,8 +18,6 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-from __future__ import print_function
-
 import weakref
 import gc
 

=== modified file 'storm/tests/cache.py'
--- storm/tests/cache.py	2019-11-21 16:06:52 +0000
+++ storm/tests/cache.py	2024-03-04 10:59:33 +0000
@@ -1,5 +1,3 @@
-from __future__ import print_function
-
 from unittest import defaultTestLoader
 
 from storm.properties import Int

=== modified file 'storm/tests/database.py'
--- storm/tests/database.py	2019-11-21 16:06:52 +0000
+++ storm/tests/database.py	2024-03-04 10:59:33 +0000
@@ -18,8 +18,6 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-from __future__ import print_function
-
 import sys
 import types
 import gc

=== modified file 'storm/tests/databases/base.py'
--- storm/tests/databases/base.py	2021-04-06 09:23:02 +0000
+++ storm/tests/databases/base.py	2024-03-04 10:59:33 +0000
@@ -20,16 +20,12 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-from __future__ import print_function
-
 from datetime import datetime, date, time, timedelta
+import pickle
 import shutil
 import sys
 import os
 
-import six
-from six.moves import cPickle as pickle
-
 from storm.uri import URI
 from storm.expr import Select, Column, SQLToken, SQLRaw, Count, Alias
 from storm.variables import (Variable, PickleVariable, BytesVariable,
@@ -152,7 +148,7 @@
         self.assertTrue(isinstance(result, Result))
         row = result.get_one()
         self.assertEqual(row, ("Title 10",))
-        self.assertTrue(isinstance(row[0], six.text_type))
+        self.assertTrue(isinstance(row[0], str))
 
     def test_execute_params(self):
         result = self.connection.execute("SELECT one FROM number "

=== modified file 'storm/tests/databases/mysql.py'
--- storm/tests/databases/mysql.py	2021-05-13 23:02:23 +0000
+++ storm/tests/databases/mysql.py	2024-03-04 10:59:33 +0000
@@ -18,11 +18,8 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-from __future__ import print_function
-
 import os
-
-from six.moves.urllib.parse import urlunsplit
+from urllib.parse import urlunsplit
 
 from storm.databases.mysql import MySQL
 from storm.database import create_database

=== modified file 'storm/tests/databases/postgres.py'
--- storm/tests/databases/postgres.py	2020-02-10 15:30:23 +0000
+++ storm/tests/databases/postgres.py	2024-03-04 10:59:33 +0000
@@ -18,14 +18,10 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-from __future__ import print_function
-
 from datetime import date, time, timedelta
 import os
 import json
-
-import six
-from six.moves.urllib.parse import urlunsplit
+from urllib.parse import urlunsplit
 
 from storm.databases.postgres import (
     Postgres, compile, currval, Returning, Case, PostgresTimeoutTracer,
@@ -171,7 +167,7 @@
         result = connection.execute("SELECT title FROM test WHERE id=1")
         title = result.get_one()[0]
 
-        self.assertTrue(isinstance(title, six.text_type))
+        self.assertTrue(isinstance(title, str))
         self.assertEqual(title, uni_str)
 
     def test_unicode_array(self):
@@ -695,11 +691,8 @@
 
         connection = self.database.connect()
         value = {"a": 3, "b": "foo", "c": None}
-        db_value = json.dumps(value)
-        if six.PY2:
-            db_value = db_value.decode("utf-8")
         connection.execute(
-            "INSERT INTO json_test (json) VALUES (?)", (db_value,))
+            "INSERT INTO json_test (json) VALUES (?)", (json.dumps(value),))
         connection.commit()
 
         store = Store(self.database)

=== modified file 'storm/tests/databases/proxy.py'
--- storm/tests/databases/proxy.py	2019-09-29 14:05:31 +0000
+++ storm/tests/databases/proxy.py	2024-03-04 10:59:33 +0000
@@ -20,17 +20,13 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-from __future__ import print_function
-
 import errno
 import os
 import select
 import socket
+import socketserver
 import threading
 
-import six
-from six.moves import socketserver
-
 
 TIMEOUT = 0.1
 
@@ -44,7 +40,7 @@
             self, request, client_address, server)
 
     def handle(self):
-        if isinstance(self.server.proxy_dest, (bytes, six.text_type)):
+        if isinstance(self.server.proxy_dest, (bytes, str)):
             dst = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
         else:
             dst = socket.socket(socket.AF_INET, socket.SOCK_STREAM)

=== modified file 'storm/tests/databases/sqlite.py'
--- storm/tests/databases/sqlite.py	2019-11-21 16:06:52 +0000
+++ storm/tests/databases/sqlite.py	2024-03-04 10:59:33 +0000
@@ -18,8 +18,6 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-from __future__ import print_function
-
 from datetime import timedelta
 import time
 import os

=== modified file 'storm/tests/event.py'
--- storm/tests/event.py	2019-11-21 16:06:52 +0000
+++ storm/tests/event.py	2024-03-04 10:59:33 +0000
@@ -18,8 +18,6 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-from __future__ import print_function
-
 from storm.event import EventSystem
 from storm.tests.helper import TestHelper
 

=== modified file 'storm/tests/expr.py'
--- storm/tests/expr.py	2023-12-07 17:04:46 +0000
+++ storm/tests/expr.py	2024-03-04 10:59:33 +0000
@@ -18,12 +18,7 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-from __future__ import print_function
-
 from decimal import Decimal
-import unittest
-
-import six
 
 from storm.variables import *
 from storm.expr import *
@@ -625,14 +620,6 @@
         self.assertEqual(statement, "?")
         self.assertVariablesEqual(state.parameters, [IntVariable(1)])
 
-    @unittest.skipUnless(six.PY2, "Python 3 has no separate long type")
-    def test_long(self):
-        state = State()
-        # 1L was more idiomatic in Python 2, but is a syntax error in Python 3.
-        statement = compile(long(1), state)
-        self.assertEqual(statement, "?")
-        self.assertVariablesEqual(state.parameters, [IntVariable(1)])
-
     def test_bool(self):
         state = State()
         statement = compile(True, state)
@@ -2254,22 +2241,16 @@
 
     def test_bytes(self):
         py_expr = compile_python(b"str")
-        self.assertEqual(py_expr, "b'str'" if six.PY3 else "'str'")
+        self.assertEqual(py_expr, "b'str'")
 
     def test_unicode(self):
         py_expr = compile_python(u"str")
-        self.assertEqual(py_expr, "'str'" if six.PY3 else "u'str'")
+        self.assertEqual(py_expr, "'str'")
 
     def test_int(self):
         py_expr = compile_python(1)
         self.assertEqual(py_expr, "1")
 
-    @unittest.skipUnless(six.PY2, "Python 3 has no separate long type")
-    def test_long(self):
-        # 1L was more idiomatic in Python 2, but is a syntax error in Python 3.
-        py_expr = compile_python(long(1))
-        self.assertEqual(py_expr, "1L")
-
     def test_bool(self):
         state = State()
         py_expr = compile_python(True, state)

=== modified file 'storm/tests/helper.py'
--- storm/tests/helper.py	2019-11-21 16:06:52 +0000
+++ storm/tests/helper.py	2024-03-04 10:59:33 +0000
@@ -18,14 +18,11 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-from __future__ import print_function
-
-import tempfile
+from io import StringIO
 import logging
 import shutil
 import sys
-
-from six.moves import cStringIO as StringIO
+import tempfile
 
 from storm.tests import mocker
 

=== modified file 'storm/tests/info.py'
--- storm/tests/info.py	2019-11-21 16:06:52 +0000
+++ storm/tests/info.py	2024-03-04 10:59:33 +0000
@@ -18,13 +18,9 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-from __future__ import print_function
-
 from weakref import ref
 import gc
 
-import six
-
 from storm.exceptions import ClassInfoError
 from storm.properties import Property
 from storm.variables import Variable
@@ -572,7 +568,7 @@
                 cls = type.__new__(meta_cls, name, bases, dict)
                 cls.__storm_table__ = "HAH! GOTCH YA!"
                 return cls
-        class Class(six.with_metaclass(MetaClass, object)):
+        class Class(metaclass=MetaClass):
             __storm_table__ = "table"
             prop1 = Property("column1", primary=True)
         Alias = ClassAlias(Class, "USE_THIS")

=== modified file 'storm/tests/mocker.py'
--- storm/tests/mocker.py	2022-03-16 16:59:21 +0000
+++ storm/tests/mocker.py	2024-03-04 10:59:33 +0000
@@ -3,8 +3,7 @@
 
 Graceful platform for test doubles in Python (mocks, stubs, fakes, and dummies).
 """
-from __future__ import print_function
-
+import builtins
 import tempfile
 import unittest
 import inspect
@@ -13,9 +12,6 @@
 import os
 import gc
 
-import six
-from six.moves import builtins
-
 
 __all__ = ["Mocker", "expect", "IS", "CONTAINS", "IN", "MATCH",
            "ANY", "ARGS", "KWARGS"]
@@ -336,7 +332,7 @@
         self._recorders = list(getattr(self, "_recorders", ()))
 
 
-class MockerBase(six.with_metaclass(MockerMeta, object)):
+class MockerBase(metaclass=MockerMeta):
     """Controller of mock objects.
 
     A mocker instance is used to command recording and replay of
@@ -563,7 +559,7 @@
                             explicitly requested via the L{passthrough()}
                             method.
         """
-        if isinstance(object, six.string_types):
+        if isinstance(object, str):
             if name is None:
                 name = object
             import_stack = object.split(".")
@@ -1096,9 +1092,6 @@
         except MatchError as e:
             return True
 
-    if six.PY2:
-        __nonzero__ = __bool__
-
     def __iter__(self):
         # XXX On py3k, when next() becomes __next__(), we'll be able
         #     to return the mock itself because it will be considered
@@ -1119,13 +1112,13 @@
         frame = sys._getframe(depth+1)
     except:
         return None
-    for name, frame_obj in six.iteritems(frame.f_locals):
+    for name, frame_obj in frame.f_locals.items():
         if frame_obj is obj:
             return name
     self = frame.f_locals.get("self")
     if self is not None:
         try:
-            items = list(six.iteritems(self.__dict__))
+            items = list(self.__dict__.items())
         except:
             pass
         else:
@@ -1274,7 +1267,7 @@
                 result = "del %s.%s" % (result, action.args[0])
             elif action.kind == "call":
                 args = [repr(x) for x in action.args]
-                items = list(six.iteritems(action.kwargs))
+                items = list(action.kwargs.items())
                 items.sort()
                 for pair in items:
                     args.append("%s=%r" % pair)
@@ -1394,7 +1387,7 @@
 
     # Either we have the same number of kwargs, or unknown keywords are
     # accepted (KWARGS was used), so check just the ones in kwargs1.
-    for key, arg1 in six.iteritems(kwargs1):
+    for key, arg1 in kwargs1.items():
         if key not in kwargs2:
             return False
         arg2 = kwargs2[key]
@@ -1834,45 +1827,30 @@
 
         if method:
             try:
-                if six.PY3:
-                    # On Python 3, inspect.getargspec includes the bound
-                    # first argument (self or similar) for bound methods,
-                    # which confuses matters.  The modern signature API
-                    # doesn't have this problem.
-                    self._signature = inspect.signature(method)
-                    # Method descriptors don't have the first argument
-                    # already bound, but we want to skip it anyway.
-                    if getattr(method, "__objclass__", None) is not None:
-                        parameters = list(self._signature.parameters.values())
-                        # This is positional-only for unbound methods that
-                        # are implemented in C.
-                        if (parameters[0].kind ==
-                                inspect.Parameter.POSITIONAL_ONLY):
-                            self._signature = self._signature.replace(
-                                parameters=parameters[1:])
-                else:
-                    (self._args, self._varargs, self._varkwargs,
-                     self._defaults) = inspect.getargspec(method)
+                # On Python 3, inspect.getargspec includes the bound first
+                # argument (self or similar) for bound methods, which
+                # confuses matters.  The modern signature API doesn't have
+                # this problem.
+                self._signature = inspect.signature(method)
+                # Method descriptors don't have the first argument already
+                # bound, but we want to skip it anyway.
+                if getattr(method, "__objclass__", None) is not None:
+                    parameters = list(self._signature.parameters.values())
+                    # This is positional-only for unbound methods that are
+                    # implemented in C.
+                    if (parameters[0].kind ==
+                            inspect.Parameter.POSITIONAL_ONLY):
+                        self._signature = self._signature.replace(
+                            parameters=parameters[1:])
             except TypeError:
                 self._unsupported = True
-            else:
-                if not six.PY3:
-                    if self._defaults is None:
-                        self._defaults = ()
-                    if type(method) is type(self.run):
-                        self._args = self._args[1:]
 
     def get_method(self):
         return self._method
 
     def _raise(self, message):
-        if six.PY3:
-            spec = str(self._signature)
-        else:
-            spec = inspect.formatargspec(self._args, self._varargs,
-                                         self._varkwargs, self._defaults)
         raise AssertionError("Specification is %s%s: %s" %
-                             (self._method.__name__, spec, message))
+                             (self._method.__name__, self._signature, message))
 
     def verify(self):
         if not self._method:
@@ -1891,26 +1869,10 @@
         if self._unsupported:
             return # Can't check it. Happens with builtin functions. :-(
         action = path.actions[-1]
-        if six.PY3:
-            try:
-                self._signature.bind(*action.args, **action.kwargs)
-            except TypeError as e:
-                self._raise(str(e))
-        else:
-            obtained_len = len(action.args)
-            obtained_kwargs = action.kwargs.copy()
-            nodefaults_len = len(self._args) - len(self._defaults)
-            for i, name in enumerate(self._args):
-                if i < obtained_len and name in action.kwargs:
-                    self._raise("%r provided twice" % name)
-                if (i >= obtained_len and i < nodefaults_len and
-                    name not in action.kwargs):
-                    self._raise("%r not provided" % name)
-                obtained_kwargs.pop(name, None)
-            if obtained_len > len(self._args) and not self._varargs:
-                self._raise("too many args provided")
-            if obtained_kwargs and not self._varkwargs:
-                self._raise("unknown kwargs: %s" % ", ".join(obtained_kwargs))
+        try:
+            self._signature.bind(*action.args, **action.kwargs)
+        except TypeError as e:
+            self._raise(str(e))
 
 def spec_checker_recorder(mocker, event):
     spec = event.path.root_mock.__mocker_spec__
@@ -1951,7 +1913,7 @@
     for referrer in gc.get_referrers(remove):
         if (type(referrer) is dict and
             referrer.get("__mocker_replace__", True)):
-            for key, value in list(six.iteritems(referrer)):
+            for key, value in list(referrer.items()):
                 if value is remove:
                     referrer[key] = install
 
@@ -2023,7 +1985,7 @@
         for kind in self._monitored:
             attr = self._get_kind_attr(kind)
             seen = set()
-            for obj in six.itervalues(self._monitored[kind]):
+            for obj in self._monitored[kind].values():
                 cls = type(obj)
                 if issubclass(cls, type):
                     cls = obj
@@ -2037,7 +1999,7 @@
                                     self.execute)
 
     def restore(self):
-        for obj, attr, original in six.itervalues(self._patched):
+        for obj, attr, original in self._patched.values():
             if original is Undefined:
                 delattr(obj, attr)
             else:

=== modified file 'storm/tests/properties.py'
--- storm/tests/properties.py	2022-03-16 16:59:21 +0000
+++ storm/tests/properties.py	2024-03-04 10:59:33 +0000
@@ -18,16 +18,12 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-from __future__ import print_function
-
 from datetime import datetime, date, time, timedelta
 from decimal import Decimal as decimal
 import gc
+import json
 import uuid
 
-import six
-
-from storm.compat import json
 from storm.exceptions import NoneError, PropertyPathError
 from storm.properties import PropertyPublisherMeta
 from storm.properties import *
@@ -996,7 +992,7 @@
     def setUp(self):
         TestHelper.setUp(self)
 
-        class Base(six.with_metaclass(PropertyPublisherMeta, object)):
+        class Base(metaclass=PropertyPublisherMeta):
             pass
 
         class Class(Base):

=== modified file 'storm/tests/schema/patch.py'
--- storm/tests/schema/patch.py	2019-11-21 16:06:52 +0000
+++ storm/tests/schema/patch.py	2024-03-04 10:59:33 +0000
@@ -18,8 +18,6 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-from __future__ import print_function
-
 import os
 import shutil
 import sys

=== modified file 'storm/tests/schema/schema.py'
--- storm/tests/schema/schema.py	2019-11-21 16:06:52 +0000
+++ storm/tests/schema/schema.py	2024-03-04 10:59:33 +0000
@@ -18,8 +18,6 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-from __future__ import print_function
-
 import os
 import sys
 

=== modified file 'storm/tests/schema/sharding.py'
--- storm/tests/schema/sharding.py	2019-08-11 17:51:37 +0000
+++ storm/tests/schema/sharding.py	2024-03-04 10:59:33 +0000
@@ -18,8 +18,6 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-from __future__ import print_function
-
 from storm.schema.schema import SchemaMissingError, UnappliedPatchesError
 from storm.schema.sharding import Sharding, PatchLevelMismatchError
 from storm.tests.mocker import MockerTestCase

=== modified file 'storm/tests/sqlobject.py'
--- storm/tests/sqlobject.py	2019-11-21 16:06:52 +0000
+++ storm/tests/sqlobject.py	2024-03-04 10:59:33 +0000
@@ -18,13 +18,9 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-from __future__ import print_function
-
 import datetime
 import operator
 
-import six
-
 from storm.database import create_database
 from storm.exceptions import NoneError
 from storm.sqlobject import *
@@ -124,7 +120,7 @@
             _defaultOrder = "-Person.name"
             _table = "person"
             _idName = "name"
-            _idType = six.text_type
+            _idType = str
             age = IntCol()
             ts = UtcDateTimeCol()
 
@@ -822,12 +818,8 @@
         """
         result = self.Person.select()
         self.assertEqual(result.__bool__(), True)
-        if six.PY2:
-            self.assertEqual(result.__nonzero__(), True)
         result = self.Person.select(self.Person.q.name == "No Person")
         self.assertEqual(result.__bool__(), False)
-        if six.PY2:
-            self.assertEqual(result.__nonzero__(), False)
 
     def test_result_set_is_empty(self):
         """
@@ -1190,7 +1182,7 @@
         # properties:
         class Person(self.SQLObject):
             _idName = "name"
-            _idType = six.text_type
+            _idType = str
             address = ForeignKey(foreignKey="Phone", dbName="address_id",
                                  notNull=True)
 

=== modified file 'storm/tests/store/base.py'
--- storm/tests/store/base.py	2021-05-13 23:02:23 +0000
+++ storm/tests/store/base.py	2024-03-04 10:59:33 +0000
@@ -20,17 +20,14 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-from __future__ import print_function
-
 import decimal
 import gc
+from io import StringIO
 import operator
+import pickle
 from uuid import uuid4
 import weakref
 
-import six
-from six.moves import cPickle as pickle, cStringIO as StringIO
-
 from storm.references import Reference, ReferenceSet, Proxy
 from storm.database import Result, STATE_DISCONNECTED
 from storm.properties import (
@@ -1053,7 +1050,7 @@
     def test_find_max_unicode(self):
         title = self.store.find(Foo).max(Foo.title)
         self.assertEqual(title, "Title 30")
-        self.assertTrue(isinstance(title, six.text_type))
+        self.assertTrue(isinstance(title, str))
 
     def test_find_max_with_empty_result_and_disallow_none(self):
         class Bar(object):
@@ -1074,7 +1071,7 @@
     def test_find_min_unicode(self):
         title = self.store.find(Foo).min(Foo.title)
         self.assertEqual(title, "Title 10")
-        self.assertTrue(isinstance(title, six.text_type))
+        self.assertTrue(isinstance(title, str))
 
     def test_find_min_with_empty_result_and_disallow_none(self):
         class Bar(object):
@@ -1157,8 +1154,7 @@
         values = self.store.find(Foo).order_by(Foo.id).values(Foo.title)
         values = list(values)
         self.assertEqual(values, ["Title 30", "Title 20", "Title 10"])
-        self.assertEqual([type(value) for value in values],
-                         [six.text_type, six.text_type, six.text_type])
+        self.assertEqual([type(value) for value in values], [str, str, str])
 
     def test_find_multiple_values(self):
         result = self.store.find(Foo).order_by(Foo.id)
@@ -4532,7 +4528,7 @@
         self.assertRaises(NoStoreError, foo2.bars.remove, object())
 
     def test_string_reference(self):
-        class Base(six.with_metaclass(PropertyPublisherMeta, object)):
+        class Base(metaclass=PropertyPublisherMeta):
             pass
 
         class MyBar(Base):
@@ -4559,7 +4555,7 @@
         metaclass.  This makes it possible to work around problems with
         circular dependencies by delaying property resolution.
         """
-        class Base(six.with_metaclass(PropertyPublisherMeta, object)):
+        class Base(metaclass=PropertyPublisherMeta):
             pass
 
         class MyFoo(Base):
@@ -4599,7 +4595,7 @@
         metaclass.  This makes it possible to work around problems with
         circular dependencies by delaying resolution of the order by column.
         """
-        class Base(six.with_metaclass(PropertyPublisherMeta, object)):
+        class Base(metaclass=PropertyPublisherMeta):
             pass
 
         class MyFoo(Base):
@@ -5024,7 +5020,7 @@
         foo = self.store.get(DictFoo, 20)
         foo["a"] = 1
 
-        self.assertEqual(list(six.iteritems(foo)), [("a", 1)])
+        self.assertEqual(list(foo.items()), [("a", 1)])
 
         new_obj = DictFoo()
         new_obj.id = 40
@@ -5358,7 +5354,7 @@
         self.store.add(foo)
         foo.id = AutoReload
         foo.title = u"New Title"
-        self.assertTrue(isinstance(foo.id, six.integer_types))
+        self.assertTrue(isinstance(foo.id, int))
         self.assertEqual(foo.title, "New Title")
 
     def test_autoreload_primary_key_doesnt_reload_everything_else(self):
@@ -5868,7 +5864,7 @@
         self.assertEqual(foo.title, "New Title")
 
     def get_bar_proxy_with_string(self):
-        class Base(six.with_metaclass(PropertyPublisherMeta, object)):
+        class Base(metaclass=PropertyPublisherMeta):
             pass
 
         class MyBarProxy(Base):
@@ -6037,7 +6033,7 @@
             try:
                 self.assertEqual(myfoo.title, title)
             except AssertionError as e:
-                raise AssertionError(six.text_type(e, 'replace') +
+                raise AssertionError(str(e, 'replace') +
                     " (ensure your database was created with CREATE DATABASE"
                     " ... CHARACTER SET utf8mb3)")
 

=== modified file 'storm/tests/store/mysql.py'
--- storm/tests/store/mysql.py	2021-04-06 09:23:02 +0000
+++ storm/tests/store/mysql.py	2024-03-04 10:59:33 +0000
@@ -18,8 +18,6 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-from __future__ import print_function
-
 import os
 
 from storm.database import create_database

=== modified file 'storm/tests/store/postgres.py'
--- storm/tests/store/postgres.py	2019-11-21 16:06:52 +0000
+++ storm/tests/store/postgres.py	2024-03-04 10:59:33 +0000
@@ -18,8 +18,6 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-from __future__ import print_function
-
 import os
 import gc
 

=== modified file 'storm/tests/store/sqlite.py'
--- storm/tests/store/sqlite.py	2019-08-11 17:51:37 +0000
+++ storm/tests/store/sqlite.py	2024-03-04 10:59:33 +0000
@@ -18,8 +18,6 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-from __future__ import print_function
-
 from storm.databases.sqlite import SQLite
 from storm.uri import URI
 from storm.tests.store.base import StoreTest, EmptyResultSetTest

=== modified file 'storm/tests/tracer.py'
--- storm/tests/tracer.py	2019-11-21 16:06:52 +0000
+++ storm/tests/tracer.py	2024-03-04 10:59:33 +0000
@@ -1,5 +1,3 @@
-from __future__ import print_function
-
 import datetime
 import os
 import sys

=== modified file 'storm/tests/twisted/__init__.py'
--- storm/tests/twisted/__init__.py	2019-06-05 11:41:07 +0000
+++ storm/tests/twisted/__init__.py	2024-03-04 10:59:33 +0000
@@ -1,5 +1,3 @@
-from __future__ import print_function
-
 __all__ = [
     'has_twisted',
     ]

=== modified file 'storm/tests/twisted/transact.py'
--- storm/tests/twisted/transact.py	2019-08-11 17:51:37 +0000
+++ storm/tests/twisted/transact.py	2024-03-04 10:59:33 +0000
@@ -1,5 +1,3 @@
-from __future__ import print_function
-
 from storm.tests import has_psycopg
 from storm.tests.helper import TestHelper
 from storm.tests.zope import has_transaction, has_zope_component

=== modified file 'storm/tests/uri.py'
--- storm/tests/uri.py	2019-11-21 16:06:52 +0000
+++ storm/tests/uri.py	2024-03-04 10:59:33 +0000
@@ -18,8 +18,6 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-from __future__ import print_function
-
 from storm.uri import URI, URIError
 from storm.tests.helper import TestHelper
 

=== modified file 'storm/tests/variables.py'
--- storm/tests/variables.py	2022-03-16 16:59:21 +0000
+++ storm/tests/variables.py	2024-03-04 10:59:33 +0000
@@ -18,18 +18,14 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-from __future__ import print_function
-
 from datetime import datetime, date, time, timedelta
 from decimal import Decimal
 import gc
+import json
+import pickle
 import weakref
 import uuid
 
-import six
-from six.moves import cPickle as pickle
-
-from storm.compat import json
 from storm.exceptions import NoneError
 from storm.variables import *
 from storm.event import EventSystem
@@ -463,8 +459,7 @@
         variable = BytesVariable()
         variable.set(b"str")
         self.assertEqual(variable.get(), b"str")
-        buffer_type = memoryview if six.PY3 else buffer
-        variable.set(buffer_type(b"buffer"))
+        variable.set(memoryview(b"buffer"))
         self.assertEqual(variable.get(), b"buffer")
         self.assertRaises(TypeError, variable.set, u"unicode")
 
@@ -487,18 +482,13 @@
         self.assertEqual(variable.get(), epoch)
         variable.set(0.0)
         self.assertEqual(variable.get(), epoch)
-        if six.PY2:
-            # 1L was more idiomatic in Python 2, but is a syntax error in
-            # Python 3.
-            variable.set(long(0))
-            self.assertEqual(variable.get(), epoch)
         variable.set(epoch)
         self.assertEqual(variable.get(), epoch)
         self.assertRaises(TypeError, variable.set, marker)
 
     def test_get_set_from_database(self):
         datetime_str = "1977-05-04 12:34:56.78"
-        datetime_uni = six.text_type(datetime_str)
+        datetime_uni = str(datetime_str)
         datetime_obj = datetime(1977, 5, 4, 12, 34, 56, 780000)
 
         variable = DateTimeVariable()
@@ -511,7 +501,7 @@
         self.assertEqual(variable.get(), datetime_obj)
 
         datetime_str = "1977-05-04 12:34:56"
-        datetime_uni = six.text_type(datetime_str)
+        datetime_uni = str(datetime_str)
         datetime_obj = datetime(1977, 5, 4, 12, 34, 56)
 
         variable.set(datetime_str, from_db=True)
@@ -576,7 +566,7 @@
 
     def test_get_set_from_database(self):
         date_str = "1977-05-04"
-        date_uni = six.text_type(date_str)
+        date_uni = str(date_str)
         date_obj = date(1977, 5, 4)
         datetime_obj = datetime(1977, 5, 4, 0, 0, 0)
 
@@ -620,7 +610,7 @@
 
     def test_get_set_from_database(self):
         time_str = "12:34:56.78"
-        time_uni = six.text_type(time_str)
+        time_uni = str(time_str)
         time_obj = time(12, 34, 56, 780000)
 
         variable = TimeVariable()
@@ -633,7 +623,7 @@
         self.assertEqual(variable.get(), time_obj)
 
         time_str = "12:34:56"
-        time_uni = six.text_type(time_str)
+        time_uni = str(time_str)
         time_obj = time(12, 34, 56)
 
         variable.set(time_str, from_db=True)
@@ -690,7 +680,7 @@
 
     def test_get_set_from_database(self):
         delta_str = "42 days 12:34:56.78"
-        delta_uni = six.text_type(delta_str)
+        delta_uni = str(delta_str)
         delta_obj = timedelta(days=42, hours=12, minutes=34,
                               seconds=56, microseconds=780000)
 
@@ -704,7 +694,7 @@
         self.assertEqual(variable.get(), delta_obj)
 
         delta_str = "1 day, 12:34:56"
-        delta_uni = six.text_type(delta_str)
+        delta_uni = str(delta_str)
         delta_obj = timedelta(days=1, hours=12, minutes=34, seconds=56)
 
         variable.set(delta_str, from_db=True)
@@ -919,10 +909,7 @@
 
 class JSONVariableTest(EncodedValueVariableTestMixin, TestHelper):
 
-    if six.PY3:
-        encode = staticmethod(lambda data: json.dumps(data))
-    else:
-        encode = staticmethod(lambda data: json.dumps(data).decode("utf-8"))
+    encode = staticmethod(lambda data: json.dumps(data))
     variable_type = JSONVariable
 
     def is_supported(self):
@@ -939,7 +926,7 @@
         # json.
         variable = self.variable_type()
         variable.set({u"a": 1})
-        self.assertTrue(isinstance(variable.get(to_db=True), six.text_type))
+        self.assertTrue(isinstance(variable.get(to_db=True), str))
 
 
 class ListVariableTest(TestHelper):

=== modified file 'storm/tests/wsgi.py'
--- storm/tests/wsgi.py	2019-06-07 17:14:33 +0000
+++ storm/tests/wsgi.py	2024-03-04 10:59:33 +0000
@@ -1,11 +1,8 @@
-from __future__ import print_function
-
+import queue
 from unittest import TestCase
 import threading
 import time
 
-from six.moves import queue
-
 from storm.wsgi import make_app
 
 class TestMakeApp(TestCase):

=== modified file 'storm/tests/zope/__init__.py'
--- storm/tests/zope/__init__.py	2019-06-05 11:41:07 +0000
+++ storm/tests/zope/__init__.py	2024-03-04 10:59:33 +0000
@@ -18,8 +18,6 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-from __future__ import print_function
-
 __all__ = [
     'has_transaction',
     'has_zope_component',

=== modified file 'storm/tests/zope/adapters.py'
--- storm/tests/zope/adapters.py	2019-08-11 17:51:37 +0000
+++ storm/tests/zope/adapters.py	2024-03-04 10:59:33 +0000
@@ -18,8 +18,6 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-from __future__ import print_function
-
 from storm.tests.helper import TestHelper
 from storm.tests.zope import has_zope_component
 

=== modified file 'storm/tests/zope/testing.py'
--- storm/tests/zope/testing.py	2019-08-12 17:07:08 +0000
+++ storm/tests/zope/testing.py	2024-03-04 10:59:33 +0000
@@ -18,13 +18,9 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-from __future__ import print_function
-
 import os
 import sys
 
-import six
-
 from storm.tests.helper import TestHelper
 from storm.tests.zope import (
     has_testresources,
@@ -245,7 +241,7 @@
         real_invalidate = store.invalidate
 
         def invalidate_proxy():
-            self.assertEqual(0, len(list(six.itervalues(store._alive))))
+            self.assertEqual(0, len(list(store._alive.values())))
             real_invalidate()
         store.invalidate = invalidate_proxy
 

=== modified file 'storm/tests/zope/zstorm.py'
--- storm/tests/zope/zstorm.py	2019-11-21 16:06:52 +0000
+++ storm/tests/zope/zstorm.py	2024-03-04 10:59:33 +0000
@@ -18,8 +18,6 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-from __future__ import print_function
-
 import threading
 import weakref
 import gc

=== modified file 'storm/tracer.py'
--- storm/tracer.py	2020-05-26 10:37:54 +0000
+++ storm/tracer.py	2024-03-04 10:59:33 +0000
@@ -1,12 +1,8 @@
-from __future__ import print_function
-
 from datetime import datetime
 import re
 import sys
 import threading
 
-import six
-
 # Circular import: imported at the end of the module.
 # from storm.database import convert_param_marks
 from storm.exceptions import TimeoutError
@@ -173,11 +169,8 @@
             # string parameters which represent encoded binary data.
             render_params = []
             for param in query_params:
-                if isinstance(param, six.text_type):
-                    if six.PY3:
-                        render_params.append(ascii(param))
-                    else:
-                        render_params.append(repr(param.encode('utf8')))
+                if isinstance(param, str):
+                    render_params.append(ascii(param))
                 else:
                     render_params.append(repr(param))
             try:

=== modified file 'storm/twisted/testing.py'
--- storm/twisted/testing.py	2020-03-18 16:02:04 +0000
+++ storm/twisted/testing.py	2024-03-04 10:59:33 +0000
@@ -1,5 +1,3 @@
-from __future__ import print_function
-
 from twisted.python.failure import Failure
 from twisted.internet.defer import execute
 

=== modified file 'storm/twisted/transact.py'
--- storm/twisted/transact.py	2020-03-18 16:02:04 +0000
+++ storm/twisted/transact.py	2024-03-04 10:59:33 +0000
@@ -1,5 +1,3 @@
-from __future__ import print_function
-
 import time
 import random
 import transaction as zope_transaction

=== modified file 'storm/tz.py'
--- storm/tz.py	2020-05-26 10:37:54 +0000
+++ storm/tz.py	2024-03-04 10:59:33 +0000
@@ -4,8 +4,6 @@
 This module offers extensions to the standard python 2.3+
 datetime module.
 """
-from __future__ import print_function
-
 __author__ = "Gustavo Niemeyer <[e-mail]>"
 __license__ = "PSF License"
 
@@ -15,8 +13,6 @@
 import sys
 import os
 
-import six
-
 relativedelta = None
 parser = None
 rrule = None
@@ -198,7 +194,7 @@
     # ftp://elsie.nci.nih.gov/pub/tz*.tar.gz
 
     def __init__(self, fileobj):
-        if isinstance(fileobj, six.string_types):
+        if isinstance(fileobj, str):
             self._filename = fileobj
             fileobj = open(fileobj)
         elif hasattr(fileobj, "name"):
@@ -699,7 +695,7 @@
         if not rrule:
             from dateutil import rrule
 
-        if isinstance(fileobj, six.string_types):
+        if isinstance(fileobj, str):
             self._s = fileobj
             fileobj = open(fileobj)
         elif hasattr(fileobj, "name"):
@@ -716,7 +712,7 @@
 
     def get(self, tzid=None):
         if tzid is None:
-            keys = list(six.iterkeys(self._vtz))
+            keys = list(self._vtz)
             if len(keys) == 0:
                 raise Exception("no timezones defined")
             elif len(keys) > 1:

=== modified file 'storm/uri.py'
--- storm/uri.py	2020-05-29 23:02:39 +0000
+++ storm/uri.py	2024-03-04 10:59:33 +0000
@@ -18,10 +18,7 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-from __future__ import print_function
-
-import six
-from six.moves.urllib.parse import quote
+from urllib.parse import quote
 
 from storm.exceptions import URIError
 
@@ -117,7 +114,7 @@
             append(escape(self.database, "/"))
         if self.options:
             options = ["%s=%s" % (escape(key), escape(value))
-                       for key, value in sorted(six.iteritems(self.options))]
+                       for key, value in sorted(self.options.items())]
             append("?")
             append("&".join(options))
         return "".join(tokens)

=== modified file 'storm/variables.py'
--- storm/variables.py	2022-03-16 16:59:21 +0000
+++ storm/variables.py	2024-03-04 10:59:33 +0000
@@ -18,19 +18,15 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-from __future__ import print_function
-
 from datetime import datetime, date, time, timedelta
 from decimal import Decimal
 from functools import partial
+import json
+import pickle
 import re
 import uuid
 import weakref
 
-import six
-from six.moves import cPickle as pickle
-
-from storm.compat import json
 from storm.exceptions import NoneError
 from storm import Undef, has_cextensions
 
@@ -58,12 +54,6 @@
 ]
 
 
-if six.PY3:
-    _buffer_type = memoryview
-else:
-    _buffer_type = buffer
-
-
 class LazyValue(object):
     """Marker to be used as a base class on lazily evaluated values."""
     __slots__ = ()
@@ -328,7 +318,7 @@
     __slots__ = ()
 
     def parse_set(self, value, from_db):
-        if not isinstance(value, (six.integer_types, float, Decimal)):
+        if not isinstance(value, (int, float, Decimal)):
             raise TypeError("Expected bool, found %r: %r"
                             % (type(value), value))
         return bool(value)
@@ -338,7 +328,7 @@
     __slots__ = ()
 
     def parse_set(self, value, from_db):
-        if not isinstance(value, (six.integer_types, float, Decimal)):
+        if not isinstance(value, (int, float, Decimal)):
             raise TypeError("Expected int, found %r: %r"
                             % (type(value), value))
         return int(value)
@@ -348,7 +338,7 @@
     __slots__ = ()
 
     def parse_set(self, value, from_db):
-        if not isinstance(value, (six.integer_types, float, Decimal)):
+        if not isinstance(value, (int, float, Decimal)):
             raise TypeError("Expected float, found %r: %r"
                             % (type(value), value))
         return float(value)
@@ -359,8 +349,7 @@
 
     @staticmethod
     def parse_set(value, from_db):
-        if (from_db and isinstance(value, six.string_types) or
-            isinstance(value, six.integer_types)):
+        if (from_db and isinstance(value, str)) or isinstance(value, int):
             value = Decimal(value)
         elif not isinstance(value, Decimal):
             raise TypeError("Expected Decimal, found %r: %r"
@@ -370,7 +359,7 @@
     @staticmethod
     def parse_get(value, to_db):
         if to_db:
-            return six.text_type(value)
+            return str(value)
         return value
 
 
@@ -378,7 +367,7 @@
     __slots__ = ()
 
     def parse_set(self, value, from_db):
-        if isinstance(value, _buffer_type):
+        if isinstance(value, memoryview):
             value = bytes(value)
         elif not isinstance(value, bytes):
             raise TypeError("Expected bytes, found %r: %r"
@@ -394,7 +383,7 @@
     __slots__ = ()
 
     def parse_set(self, value, from_db):
-        if not isinstance(value, six.text_type):
+        if not isinstance(value, str):
             raise TypeError("Expected text, found %r: %r"
                             % (type(value), value))
         return value
@@ -411,7 +400,7 @@
         if from_db:
             if isinstance(value, datetime):
                 pass
-            elif isinstance(value, six.string_types):
+            elif isinstance(value, str):
                 if " " not in value:
                     raise ValueError("Unknown date/time format: %r" % value)
                 date_str, time_str = value.split(" ")
@@ -425,7 +414,7 @@
                 else:
                     value = value.astimezone(self._tzinfo)
         else:
-            if type(value) in six.integer_types + (float, ):
+            if type(value) in (int, float):
                 value = datetime.utcfromtimestamp(value)
             elif not isinstance(value, datetime):
                 raise TypeError("Expected datetime, found %s" % repr(value))
@@ -456,7 +445,7 @@
                 return value.date()
             if isinstance(value, date):
                 return value
-            if not isinstance(value, six.string_types):
+            if not isinstance(value, str):
                 raise TypeError("Expected date, found %s" % repr(value))
             if " " in value:
                 value, time_str = value.split(" ")
@@ -479,7 +468,7 @@
                 return None
             if isinstance(value, time):
                 return value
-            if not isinstance(value, six.string_types):
+            if not isinstance(value, str):
                 raise TypeError("Expected time, found %s" % repr(value))
             if " " in value:
                 date_str, value = value.split(" ")
@@ -502,7 +491,7 @@
                 return None
             if isinstance(value, timedelta):
                 return value
-            if not isinstance(value, six.string_types):
+            if not isinstance(value, str):
                 raise TypeError("Expected timedelta, found %s" % repr(value))
             return _parse_interval(value)
         else:
@@ -515,7 +504,7 @@
     __slots__ = ()
 
     def parse_set(self, value, from_db):
-        if from_db and isinstance(value, six.string_types):
+        if from_db and isinstance(value, str):
             value = uuid.UUID(value)
         elif not isinstance(value, uuid.UUID):
             raise TypeError("Expected UUID, found %r: %r"
@@ -524,7 +513,7 @@
 
     def parse_get(self, value, to_db):
         if to_db:
-            return six.text_type(value)
+            return str(value)
         return value
 
 
@@ -607,7 +596,7 @@
 
     def parse_set(self, value, from_db):
         if from_db:
-            if isinstance(value, _buffer_type):
+            if isinstance(value, memoryview):
                 value = bytes(value)
             return self._loads(value)
         else:
@@ -641,7 +630,7 @@
     __slots__ = ()
 
     def _loads(self, value):
-        if not isinstance(value, six.text_type):
+        if not isinstance(value, str):
             raise TypeError(
                 "Cannot safely assume encoding of byte string %r." % value)
         return json.loads(value)
@@ -651,7 +640,7 @@
         # and so we treat it as such here. In other words, this method returns
         # Unicode text and never bytes.
         dump = json.dumps(value, ensure_ascii=False)
-        if not isinstance(dump, six.text_type):
+        if not isinstance(dump, str):
             # json.dumps() does not always return unicode. See
             # http://code.google.com/p/simplejson/issues/detail?id=40 for one
             # of many discussions of str/unicode handling in simplejson.

=== modified file 'storm/wsgi.py'
--- storm/wsgi.py	2020-05-26 10:37:54 +0000
+++ storm/wsgi.py	2024-03-04 10:59:33 +0000
@@ -21,8 +21,6 @@
 
 """Glue to wire a storm timeline tracer up to a WSGI app."""
 
-from __future__ import print_function
-
 import threading
 import weakref
 

=== modified file 'storm/xid.py'
--- storm/xid.py	2019-06-05 11:41:07 +0000
+++ storm/xid.py	2024-03-04 10:59:33 +0000
@@ -19,9 +19,6 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-from __future__ import print_function
-
-
 class Xid(object):
     """
     Represent a transaction identifier compliant with the XA specification.

=== modified file 'storm/zope/__init__.py'
--- storm/zope/__init__.py	2019-06-05 11:41:07 +0000
+++ storm/zope/__init__.py	2024-03-04 10:59:33 +0000
@@ -18,8 +18,6 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-from __future__ import print_function
-
 from zope.interface import classImplements
 
 from storm.info import ObjectInfo

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

=== modified file 'storm/zope/interfaces.py'
--- storm/zope/interfaces.py	2019-08-11 09:07:34 +0000
+++ storm/zope/interfaces.py	2024-03-04 10:59:33 +0000
@@ -18,9 +18,6 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-from __future__ import print_function
-
-import six
 from zope.interface import Interface
 
 from storm.expr import Undef
@@ -174,9 +171,6 @@
             which doesn't have a C{__bool__} implementation.
         """
 
-    if six.PY2:
-        __nonzero__ = __bool__
-
     def __contains__(item):
        """Support C{if FooObject in Foo.select(query)}."""
 

=== modified file 'storm/zope/metaconfigure.py'
--- storm/zope/metaconfigure.py	2019-06-05 11:41:07 +0000
+++ storm/zope/metaconfigure.py	2024-03-04 10:59:33 +0000
@@ -18,8 +18,6 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-from __future__ import print_function
-
 from zope import component
 
 from storm.zope.interfaces import IZStorm

=== modified file 'storm/zope/metadirectives.py'
--- storm/zope/metadirectives.py	2019-06-05 11:41:07 +0000
+++ storm/zope/metadirectives.py	2024-03-04 10:59:33 +0000
@@ -18,8 +18,6 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-from __future__ import print_function
-
 from zope.interface import Interface
 from zope.schema import TextLine
 

=== modified file 'storm/zope/schema.py'
--- storm/zope/schema.py	2019-06-05 11:41:07 +0000
+++ storm/zope/schema.py	2024-03-04 10:59:33 +0000
@@ -19,8 +19,6 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 """ZStorm-aware schema manager."""
-from __future__ import print_function
-
 import transaction
 
 from storm.schema import Schema

=== modified file 'storm/zope/testing.py'
--- storm/zope/testing.py	2019-08-11 09:48:05 +0000
+++ storm/zope/testing.py	2024-03-04 10:59:33 +0000
@@ -18,12 +18,9 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-from __future__ import print_function
-
 import os
 import shutil
 
-import six
 import transaction
 
 from testresources import TestResourceManager
@@ -102,7 +99,7 @@
             if isinstance(databases, dict):
                 databases = [
                     {"name": name, "uri": uri, "schema": schema}
-                    for name, (uri, schema) in six.iteritems(databases)]
+                    for name, (uri, schema) in databases.items()]
 
             # Provide the global IZStorm utility before applying patches, so
             # patch code can get the ztorm object if needed (e.g. looking up

=== modified file 'storm/zope/zstorm.py'
--- storm/zope/zstorm.py	2019-08-11 09:48:05 +0000
+++ storm/zope/zstorm.py	2024-03-04 10:59:33 +0000
@@ -24,14 +24,11 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-from __future__ import print_function
-
 import threading
 import weakref
 
 from uuid import uuid4
 
-import six
 from zope.interface import implementer
 
 import transaction
@@ -211,7 +208,7 @@
         # it to avoid the problem where a store is deallocated during
         # iteration causing RuntimeError: dictionary changed size
         # during iteration.
-        for store, name in list(six.iteritems(self._name_index)):
+        for store, name in list(self._name_index.items()):
             yield name, store
 
     def get_name(self, store):

=== modified file 'tox.ini'
--- tox.ini	2023-02-09 16:28:53 +0000
+++ tox.ini	2024-03-04 10:59:33 +0000
@@ -1,6 +1,5 @@
 [tox]
 envlist =
-    py27-{cextensions,nocextensions}
     py35-{cextensions,nocextensions}
     py36-{cextensions,nocextensions}
     py37-{cextensions,nocextensions}
@@ -12,7 +11,7 @@
 
 [testenv]
 download =
-    py27,py35: true
+    py35: true
 deps =
     .[test]
 passenv =
@@ -21,8 +20,8 @@
 setenv =
     cextensions: STORM_CEXTENSIONS = 1
     nocextensions: STORM_CEXTENSIONS = 0
-    py27,py35: VIRTUALENV_DOWNLOAD = 1
-    py27,py35: VIRTUALENV_PIP = 20.3.4
+    py35: VIRTUALENV_DOWNLOAD = 1
+    py35: VIRTUALENV_PIP = 20.3.4
 commands =
     python dev/test {posargs}