Merge "Clean up most py3k compat" into main

12 files changed, 51 insertions, 49 deletions

diff --git a/test/sql/test_compare.py b/test/sql/test_compare.py
index 814d9a2ad..af78ea19b 100644
--- a/test/sql/test_compare.py
+++ b/test/sql/test_compare.py
@@ -957,8 +957,7 @@ class CoreFixtures:
             .where(table_b_b.c.c > 10),
         )
 
-    if util.py37:
-        fixtures.append(_update_dml_w_dicts)
+    fixtures.append(_update_dml_w_dicts)
 
     def _lambda_fixtures():
         def one():
diff --git a/test/sql/test_compiler.py b/test/sql/test_compiler.py
index 23a2833ca..6779ea7bf 100644
--- a/test/sql/test_compiler.py
+++ b/test/sql/test_compiler.py
@@ -97,7 +97,6 @@ from sqlalchemy.testing import is_
 from sqlalchemy.testing import is_true
 from sqlalchemy.testing import mock
 from sqlalchemy.testing import ne_
-from sqlalchemy.util import u
 
 table1 = table(
     "mytable",
@@ -5002,10 +5001,10 @@ class DDLTest(fixtures.TestBase, AssertsCompiledSQL):
 
     def test_reraise_of_column_spec_issue_unicode(self):
         MyType = self._illegal_type_fixture()
-        t1 = Table("t", MetaData(), Column(u("méil"), MyType()))
+        t1 = Table("t", MetaData(), Column("méil", MyType()))
         assert_raises_message(
             exc.CompileError,
-            u(r"\(in table 't', column 'méil'\): Couldn't compile type"),
+            r"\(in table 't', column 'méil'\): Couldn't compile type",
             schema.CreateTable(t1).compile,
         )
 
diff --git a/test/sql/test_ddlemit.py b/test/sql/test_ddlemit.py
index 667891236..8e70ed9b4 100644
--- a/test/sql/test_ddlemit.py
+++ b/test/sql/test_ddlemit.py
@@ -1,3 +1,5 @@
+from unittest.mock import Mock
+
 from sqlalchemy import Column
 from sqlalchemy import ForeignKey
 from sqlalchemy import Index
@@ -9,7 +11,6 @@ from sqlalchemy import Table
 from sqlalchemy.sql.ddl import SchemaDropper
 from sqlalchemy.sql.ddl import SchemaGenerator
 from sqlalchemy.testing import fixtures
-from sqlalchemy.testing.mock import Mock
 
 
 class EmitDDLTest(fixtures.TestBase):
diff --git a/test/sql/test_deprecations.py b/test/sql/test_deprecations.py
index 89938ee5e..5828fbdcc 100644
--- a/test/sql/test_deprecations.py
+++ b/test/sql/test_deprecations.py
@@ -49,7 +49,6 @@ from sqlalchemy.testing import is_true
 from sqlalchemy.testing import mock
 from sqlalchemy.testing.schema import Column
 from sqlalchemy.testing.schema import Table
-from sqlalchemy.util import compat
 from .test_update import _UpdateFromTestBase
 
 
@@ -178,7 +177,7 @@ class DeprecationWarningsTest(fixtures.TestBase, AssertsCompiledSQL):
         obj = cls.__new__(cls)
         with mock.patch.object(cls, "_copy") as _copy:
             with testing.expect_deprecated(
-                r"The %s\(\) method is deprecated" % compat._qualname(cls.copy)
+                r"The %s\(\) method is deprecated" % cls.copy.__qualname__
             ):
                 obj.copy(schema="s", target_table="tt", arbitrary="arb")
 
diff --git a/test/sql/test_external_traversal.py b/test/sql/test_external_traversal.py
index e01ec0738..0ac73fc16 100644
--- a/test/sql/test_external_traversal.py
+++ b/test/sql/test_external_traversal.py
@@ -1,3 +1,4 @@
+import pickle
 import re
 
 from sqlalchemy import and_
@@ -44,7 +45,6 @@ from sqlalchemy.testing import fixtures
 from sqlalchemy.testing import is_
 from sqlalchemy.testing import is_not
 from sqlalchemy.testing.schema import eq_clause_element
-from sqlalchemy.util import pickle
 
 A = B = t1 = t2 = t3 = table1 = table2 = table3 = table4 = None
 
diff --git a/test/sql/test_functions.py b/test/sql/test_functions.py
index 6c794717c..9378cfc38 100644
--- a/test/sql/test_functions.py
+++ b/test/sql/test_functions.py
@@ -1,6 +1,7 @@
 from copy import deepcopy
 import datetime
 import decimal
+import pickle
 
 from sqlalchemy import ARRAY
 from sqlalchemy import bindparam
@@ -26,7 +27,6 @@ from sqlalchemy import testing
 from sqlalchemy import Text
 from sqlalchemy import true
 from sqlalchemy import types as sqltypes
-from sqlalchemy import util
 from sqlalchemy.dialects import mysql
 from sqlalchemy.dialects import oracle
 from sqlalchemy.dialects import postgresql
@@ -510,7 +510,7 @@ class CompileTest(fixtures.TestBase, AssertsCompiledSQL):
 
         # test pickling
         self.assert_compile(
-            util.pickle.loads(util.pickle.dumps(f1)),
+            pickle.loads(pickle.dumps(f1)),
             "my_func(:my_func_1, :my_func_2, NULL, :my_func_3)",
         )
 
@@ -533,7 +533,7 @@ class CompileTest(fixtures.TestBase, AssertsCompiledSQL):
         f1 = func.row_number().over()
 
         self.assert_compile(
-            util.pickle.loads(util.pickle.dumps(f1)),
+            pickle.loads(pickle.dumps(f1)),
             "row_number() OVER ()",
         )
 
@@ -550,7 +550,7 @@ class CompileTest(fixtures.TestBase, AssertsCompiledSQL):
         f1 = func.percentile_cont(literal(1)).within_group()
 
         self.assert_compile(
-            util.pickle.loads(util.pickle.dumps(f1)),
+            pickle.loads(pickle.dumps(f1)),
             "percentile_cont(:param_1) WITHIN GROUP (ORDER BY )",
         )
 
@@ -558,7 +558,7 @@ class CompileTest(fixtures.TestBase, AssertsCompiledSQL):
             column("q"), column("p").desc()
         )
         self.assert_compile(
-            util.pickle.loads(util.pickle.dumps(f1)),
+            pickle.loads(pickle.dumps(f1)),
             "percentile_cont(:param_1) WITHIN GROUP (ORDER BY q, p DESC)",
         )
 
diff --git a/test/sql/test_operators.py b/test/sql/test_operators.py
index b86e8d075..831b75e7e 100644
--- a/test/sql/test_operators.py
+++ b/test/sql/test_operators.py
@@ -1,5 +1,7 @@
+import collections.abc as collections_abc
 import datetime
 import operator
+import pickle
 
 from sqlalchemy import and_
 from sqlalchemy import between
@@ -14,7 +16,6 @@ from sqlalchemy import or_
 from sqlalchemy import String
 from sqlalchemy import testing
 from sqlalchemy import text
-from sqlalchemy import util
 from sqlalchemy.dialects import mssql
 from sqlalchemy.dialects import mysql
 from sqlalchemy.dialects import oracle
@@ -677,7 +678,7 @@ class ExtensionOperatorTest(fixtures.TestBase, testing.AssertsCompiledSQL):
                     return self.op("->")(index)
 
         col = Column("x", MyType())
-        assert not isinstance(col, util.collections_abc.Iterable)
+        assert not isinstance(col, collections_abc.Iterable)
 
     def test_lshift(self):
         class MyType(UserDefinedType):
@@ -2234,11 +2235,11 @@ class ComparisonOperatorTest(fixtures.TestBase, testing.AssertsCompiledSQL):
             & self.table1.c.myid.between(15, 20)
             & self.table1.c.myid.like("hoho")
         )
-        eq_(str(clause), str(util.pickle.loads(util.pickle.dumps(clause))))
+        eq_(str(clause), str(pickle.loads(pickle.dumps(clause))))
 
     def test_pickle_operators_two(self):
         clause = tuple_(1, 2, 3)
-        eq_(str(clause), str(util.pickle.loads(util.pickle.dumps(clause))))
+        eq_(str(clause), str(pickle.loads(pickle.dumps(clause))))
 
     @testing.combinations(
         (operator.lt, "<", ">"),
diff --git a/test/sql/test_resultset.py b/test/sql/test_resultset.py
index 9d4e14517..c5dd35ce1 100644
--- a/test/sql/test_resultset.py
+++ b/test/sql/test_resultset.py
@@ -1,7 +1,12 @@
 import collections
+import collections.abc as collections_abc
 from contextlib import contextmanager
 import csv
+from io import StringIO
 import operator
+import pickle
+from unittest.mock import Mock
+from unittest.mock import patch
 
 from sqlalchemy import CHAR
 from sqlalchemy import column
@@ -24,7 +29,6 @@ from sqlalchemy import true
 from sqlalchemy import tuple_
 from sqlalchemy import type_coerce
 from sqlalchemy import TypeDecorator
-from sqlalchemy import util
 from sqlalchemy import VARCHAR
 from sqlalchemy.engine import cursor as _cursor
 from sqlalchemy.engine import default
@@ -54,11 +58,8 @@ from sqlalchemy.testing import le_
 from sqlalchemy.testing import mock
 from sqlalchemy.testing import ne_
 from sqlalchemy.testing import not_in
-from sqlalchemy.testing.mock import Mock
-from sqlalchemy.testing.mock import patch
 from sqlalchemy.testing.schema import Column
 from sqlalchemy.testing.schema import Table
-from sqlalchemy.util import collections_abc
 
 
 class CursorResultTest(fixtures.TablesTest):
@@ -290,7 +291,7 @@ class CursorResultTest(fixtures.TablesTest):
             ],
         )
 
-        for pickle in False, True:
+        for use_pickle in False, True:
             for use_labels in False, True:
                 result = connection.execute(
                     users.select()
@@ -302,8 +303,8 @@ class CursorResultTest(fixtures.TablesTest):
                     )
                 ).fetchall()
 
-                if pickle:
-                    result = util.pickle.loads(util.pickle.dumps(result))
+                if use_pickle:
+                    result = pickle.loads(pickle.dumps(result))
 
                 eq_(result, [(7, "jack"), (8, "ed"), (9, "fred")])
                 if use_labels:
@@ -325,7 +326,7 @@ class CursorResultTest(fixtures.TablesTest):
 
                 # previously would warn
 
-                if pickle:
+                if use_pickle:
                     with expect_raises_message(
                         exc.NoSuchColumnError,
                         "Row was unpickled; lookup by ColumnElement is "
@@ -335,7 +336,7 @@ class CursorResultTest(fixtures.TablesTest):
                 else:
                     eq_(result[0]._mapping[users.c.user_id], 7)
 
-                if pickle:
+                if use_pickle:
                     with expect_raises_message(
                         exc.NoSuchColumnError,
                         "Row was unpickled; lookup by ColumnElement is "
@@ -972,7 +973,7 @@ class CursorResultTest(fixtures.TablesTest):
             lambda: r._mapping[fake_table.c.user_id],
         )
 
-        r = util.pickle.loads(util.pickle.dumps(r))
+        r = pickle.loads(pickle.dumps(r))
         assert_raises_message(
             exc.InvalidRequestError,
             "Ambiguous column name",
@@ -1605,7 +1606,7 @@ class CursorResultTest(fixtures.TablesTest):
             users.select().where(users.c.user_id == 1)
         ).fetchone()
 
-        s = util.StringIO()
+        s = StringIO()
         writer = csv.writer(s)
         # csv performs PySequenceCheck call
         writer.writerow(row)
diff --git a/test/sql/test_selectable.py b/test/sql/test_selectable.py
index f0df92b70..eca4623c4 100644
--- a/test/sql/test_selectable.py
+++ b/test/sql/test_selectable.py
@@ -1,4 +1,6 @@
 """Test various algorithmic properties of selectables."""
+from itertools import zip_longest
+
 from sqlalchemy import and_
 from sqlalchemy import bindparam
 from sqlalchemy import Boolean
@@ -627,7 +629,7 @@ class SelectableTest(
         """tests for #6808"""
         s1 = select(*cols_expr).select_from(*select_from)
 
-        for ff, efp in util.zip_longest(s1.get_final_froms(), exp_final_froms):
+        for ff, efp in zip_longest(s1.get_final_froms(), exp_final_froms):
             assert ff.compare(efp)
 
         eq_(s1.columns_clause_froms, exp_cc_froms)
diff --git a/test/sql/test_sequences.py b/test/sql/test_sequences.py
index c5c76ad08..d11961862 100644
--- a/test/sql/test_sequences.py
+++ b/test/sql/test_sequences.py
@@ -5,7 +5,6 @@ from sqlalchemy import MetaData
 from sqlalchemy import Sequence
 from sqlalchemy import String
 from sqlalchemy import testing
-from sqlalchemy import util
 from sqlalchemy.dialects import sqlite
 from sqlalchemy.schema import CreateSequence
 from sqlalchemy.schema import DropSequence
@@ -113,7 +112,7 @@ class SequenceExecTest(fixtures.TestBase):
     def _assert_seq_result(self, ret):
         """asserts return of next_value is an int"""
 
-        assert isinstance(ret, util.int_types)
+        assert isinstance(ret, int)
         assert ret >= testing.db.dialect.default_sequence_base
 
     def test_execute(self, connection):
diff --git a/test/sql/test_types.py b/test/sql/test_types.py
index 0891defc2..f63e1e01b 100644
--- a/test/sql/test_types.py
+++ b/test/sql/test_types.py
@@ -275,13 +275,13 @@ class AdaptTest(fixtures.TestBase):
         eq_(types.Integer().python_type, int)
         eq_(types.Numeric().python_type, decimal.Decimal)
         eq_(types.Numeric(asdecimal=False).python_type, float)
-        eq_(types.LargeBinary().python_type, util.binary_type)
+        eq_(types.LargeBinary().python_type, bytes)
         eq_(types.Float().python_type, float)
         eq_(types.Interval().python_type, datetime.timedelta)
         eq_(types.Date().python_type, datetime.date)
         eq_(types.DateTime().python_type, datetime.datetime)
         eq_(types.String().python_type, str)
-        eq_(types.Unicode().python_type, util.text_type)
+        eq_(types.Unicode().python_type, str)
         eq_(types.Enum("one", "two", "three").python_type, str)
 
         assert_raises(
@@ -624,8 +624,8 @@ class UserDefinedRoundTripTest(_UserDefinedTypeFixture, fixtures.TablesTest):
                 user_id=2,
                 goofy="jack",
                 goofy2="jack",
-                goofy4=util.u("jack"),
-                goofy7=util.u("jack"),
+                goofy4="jack",
+                goofy7="jack",
                 goofy8=12,
                 goofy9=12,
                 goofy10=12,
@@ -637,8 +637,8 @@ class UserDefinedRoundTripTest(_UserDefinedTypeFixture, fixtures.TablesTest):
                 user_id=3,
                 goofy="lala",
                 goofy2="lala",
-                goofy4=util.u("lala"),
-                goofy7=util.u("lala"),
+                goofy4="lala",
+                goofy7="lala",
                 goofy8=15,
                 goofy9=15,
                 goofy10=15,
@@ -650,8 +650,8 @@ class UserDefinedRoundTripTest(_UserDefinedTypeFixture, fixtures.TablesTest):
                 user_id=4,
                 goofy="fred",
                 goofy2="fred",
-                goofy4=util.u("fred"),
-                goofy7=util.u("fred"),
+                goofy4="fred",
+                goofy7="fred",
                 goofy8=9,
                 goofy9=9,
                 goofy10=9,
@@ -786,8 +786,8 @@ class BindProcessorInsertValuesTest(UserDefinedRoundTripTest):
                 user_id=2,
                 goofy="jack",
                 goofy2="jack",
-                goofy4=util.u("jack"),
-                goofy7=util.u("jack"),
+                goofy4="jack",
+                goofy7="jack",
                 goofy8=12,
                 goofy9=12,
                 goofy10=12,
@@ -798,8 +798,8 @@ class BindProcessorInsertValuesTest(UserDefinedRoundTripTest):
                 user_id=3,
                 goofy="lala",
                 goofy2="lala",
-                goofy4=util.u("lala"),
-                goofy7=util.u("lala"),
+                goofy4="lala",
+                goofy7="lala",
                 goofy8=15,
                 goofy9=15,
                 goofy10=15,
@@ -810,8 +810,8 @@ class BindProcessorInsertValuesTest(UserDefinedRoundTripTest):
                 user_id=4,
                 goofy="fred",
                 goofy2="fred",
-                goofy4=util.u("fred"),
-                goofy7=util.u("fred"),
+                goofy4="fred",
+                goofy7="fred",
                 goofy8=9,
                 goofy9=9,
                 goofy10=9,
@@ -3494,7 +3494,7 @@ class NumericRawSQLTest(fixtures.TestBase):
         metadata = self.metadata
         self._fixture(connection, metadata, Integer, 45)
         val = connection.exec_driver_sql("select val from t").scalar()
-        assert isinstance(val, util.int_types)
+        assert isinstance(val, int)
         eq_(val, 45)
 
     @testing.provide_metadata
diff --git a/test/sql/test_utils.py b/test/sql/test_utils.py
index 24a149ece..61777def5 100644
--- a/test/sql/test_utils.py
+++ b/test/sql/test_utils.py
@@ -1,3 +1,5 @@
+from itertools import zip_longest
+
 from sqlalchemy import Column
 from sqlalchemy import Integer
 from sqlalchemy import MetaData
@@ -5,7 +7,6 @@ from sqlalchemy import select
 from sqlalchemy import String
 from sqlalchemy import Table
 from sqlalchemy import testing
-from sqlalchemy import util
 from sqlalchemy.sql import base as sql_base
 from sqlalchemy.sql import coercions
 from sqlalchemy.sql import column
@@ -146,5 +147,5 @@ class MiscTest(fixtures.TestBase):
 
         unwrapped = sql_util.unwrap_order_by(expr)
 
-        for a, b in util.zip_longest(unwrapped, expected):
+        for a, b in zip_longest(unwrapped, expected):
             assert a is not None and a.compare(b)