Merge "Removed some legacy terms in favor of modern equivalents. (D&I)"

Author: zzzeek

lib/sqlalchemy/testing/fixtures.py

@@ -30,7 +30,7 @@
 class TestBase(object):
     # A sequence of database names to always run, regardless of the
     # constraints below.
-    __whitelist__ = ()
+    __allowlist__ = ()
 
     # A sequence of requirement names matching testing.requires decorators
     __requires__ = ()

regen_callcounts.tox.ini

@@ -12,7 +12,7 @@ deps=pytest
      db_mssql: .[mssql]
 
 
-whitelist_externals=sh
+allowlist_externals=sh
 
 commands=
     db_{mysql}: {env:BASECOMMAND} {env:MYSQL:} {posargs}

test/orm/test_session.py

@@ -1811,7 +1811,7 @@ class SessionInterface(fixtures.TestBase):
     def _public_session_methods(self):
         Session = sa.orm.session.Session
 
-        blacklist = {"begin", "query", "bind_mapper", "get", "bind_table"}
+        blocklist = {"begin", "query", "bind_mapper", "get", "bind_table"}
         specials = {"__iter__", "__contains__"}
         ok = set()
         for name in dir(Session):
@@ -1823,7 +1823,7 @@ def _public_session_methods(self):
                     or _py_inspect.isfunction(getattr(Session, name))
                 )
             ):
-                if name in blacklist:
+                if name in blocklist:
                     continue
                 spec = inspect_getfullargspec(getattr(Session, name))
                 if len(spec[0]) > 1 or spec[1]:

tox.ini

@@ -39,7 +39,7 @@ deps=
 
      cov: pytest-cov
 
-whitelist_externals=sh
+allowlist_externals=sh
 
 # PYTHONPATH - erased so that we use the build that's present
 # in .tox as the SQLAlchemy library to be imported