summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorFederico Caselli <cfederico87@gmail.com>2020-03-29 20:57:08 +0200
committerFederico Caselli <cfederico87@gmail.com>2020-03-30 00:35:33 +0200
commit4bd4b483e07bd81dd2417aa2a3e737fedb7ee5b4 (patch)
treee2ce96a7ce03236eb1839cd146d64a5553fdad69 /lib
parent5b6a1a98903830ac563f936ccbe1fe30d88ec77c (diff)
downloadsqlalchemy-4bd4b483e07bd81dd2417aa2a3e737fedb7ee5b4.tar.gz
Remove support for python 3.4
Also remove no longer used compat code Change-Id: Ifda239fd84b425e43f4028cb55a5b3b8efa4dfc6
Diffstat (limited to 'lib')
-rw-r--r--lib/sqlalchemy/sql/base.py2
-rw-r--r--lib/sqlalchemy/testing/mock.py4
-rw-r--r--lib/sqlalchemy/util/__init__.py2
-rw-r--r--lib/sqlalchemy/util/compat.py21
4 files changed, 6 insertions, 23 deletions
diff --git a/lib/sqlalchemy/sql/base.py b/lib/sqlalchemy/sql/base.py
index f093cad90..682ef891c 100644
--- a/lib/sqlalchemy/sql/base.py
+++ b/lib/sqlalchemy/sql/base.py
@@ -192,7 +192,7 @@ class _DialectArgView(util.collections_abc.MutableMapping):
def __iter__(self):
return (
- util.safe_kwarg("%s_%s" % (dialect_name, value_name))
+ "%s_%s" % (dialect_name, value_name)
for dialect_name in self.obj.dialect_options
for value_name in self.obj.dialect_options[
dialect_name
diff --git a/lib/sqlalchemy/testing/mock.py b/lib/sqlalchemy/testing/mock.py
index 16c2d2ac9..a63082b9b 100644
--- a/lib/sqlalchemy/testing/mock.py
+++ b/lib/sqlalchemy/testing/mock.py
@@ -9,10 +9,10 @@
"""
from __future__ import absolute_import
-from ..util import py33
+from ..util import py3k
-if py33:
+if py3k:
from unittest.mock import MagicMock
from unittest.mock import Mock
from unittest.mock import call
diff --git a/lib/sqlalchemy/util/__init__.py b/lib/sqlalchemy/util/__init__.py
index 1909619c5..c0e290cb0 100644
--- a/lib/sqlalchemy/util/__init__.py
+++ b/lib/sqlalchemy/util/__init__.py
@@ -63,7 +63,6 @@ from .compat import parse_qsl # noqa
from .compat import pickle # noqa
from .compat import print_ # noqa
from .compat import py2k # noqa
-from .compat import py33 # noqa
from .compat import py36 # noqa
from .compat import py3k # noqa
from .compat import quote_plus # noqa
@@ -71,7 +70,6 @@ from .compat import raise_ # noqa
from .compat import raise_from_cause # noqa
from .compat import reduce # noqa
from .compat import reraise # noqa
-from .compat import safe_kwarg # noqa
from .compat import string_types # noqa
from .compat import StringIO # noqa
from .compat import text_type # noqa
diff --git a/lib/sqlalchemy/util/compat.py b/lib/sqlalchemy/util/compat.py
index 31654b97c..79de3c978 100644
--- a/lib/sqlalchemy/util/compat.py
+++ b/lib/sqlalchemy/util/compat.py
@@ -16,12 +16,8 @@ import sys
py36 = sys.version_info >= (3, 6)
-py33 = sys.version_info >= (3, 3)
-py35 = sys.version_info >= (3, 5)
-py32 = sys.version_info >= (3, 2)
py3k = sys.version_info >= (3, 0)
py2k = sys.version_info < (3, 0)
-py265 = sys.version_info >= (2, 6, 5)
cpython = platform.python_implementation() == "CPython"
@@ -53,13 +49,6 @@ except ImportError:
import dummy_threading as threading # noqa
-# work around http://bugs.python.org/issue2646
-if py265:
- safe_kwarg = lambda arg: arg # noqa
-else:
- safe_kwarg = str
-
-
def inspect_getfullargspec(func):
"""Fully vendored version of getfullargspec from Python 3.3."""
@@ -298,7 +287,7 @@ else:
TYPE_CHECKING = False
-if py35:
+if py3k:
def _formatannotation(annotation, base_module=None):
"""vendored from python 3.7
@@ -378,7 +367,7 @@ if py35:
return result
-elif py2k:
+else:
from inspect import formatargspec as _inspect_formatargspec
def inspect_formatargspec(*spec, **kw):
@@ -386,13 +375,9 @@ elif py2k:
return _inspect_formatargspec(*spec[0:4], **kw) # noqa
-else:
- from inspect import formatargspec as inspect_formatargspec # noqa
-
-
# Fix deprecation of accessing ABCs straight from collections module
# (which will stop working in 3.8).
-if py33:
+if py3k:
import collections.abc as collections_abc
else:
import collections as collections_abc # noqa