diff options
author | CaselIT <cfederico87@gmail.com> | 2021-11-23 21:51:23 +0100 |
---|---|---|
committer | CaselIT <cfederico87@gmail.com> | 2021-11-23 21:52:10 +0100 |
commit | 2719c0ef1917af0b74b9d642a75c9b6dd5cf537a (patch) | |
tree | 8ebbae8c314524416fa62fc1d86805fa24422cb7 /alembic/util | |
parent | fba449536c8ae4417492eba3ead6408b481513ab (diff) | |
download | alembic-2719c0ef1917af0b74b9d642a75c9b6dd5cf537a.tar.gz |
Remove usage of no longer needed compat code
Change-Id: I3180931673496260614e69e95f7da09d68b51714
Diffstat (limited to 'alembic/util')
-rw-r--r-- | alembic/util/compat.py | 4 | ||||
-rw-r--r-- | alembic/util/langhelpers.py | 5 | ||||
-rw-r--r-- | alembic/util/messaging.py | 6 | ||||
-rw-r--r-- | alembic/util/sqla_compat.py | 4 |
4 files changed, 5 insertions, 14 deletions
diff --git a/alembic/util/compat.py b/alembic/util/compat.py index 48218ab..54420cb 100644 --- a/alembic/util/compat.py +++ b/alembic/util/compat.py @@ -12,10 +12,6 @@ py39 = sys.version_info >= (3, 9) py38 = sys.version_info >= (3, 8) py37 = sys.version_info >= (3, 7) -string_types = (str,) -binary_type = bytes -text_type = str - # produce a wrapper that allows encoded text to stream # into a given buffer, but doesn't close it. diff --git a/alembic/util/langhelpers.py b/alembic/util/langhelpers.py index 4db9a5f..fd7ccb8 100644 --- a/alembic/util/langhelpers.py +++ b/alembic/util/langhelpers.py @@ -21,7 +21,6 @@ from sqlalchemy.util import to_list # noqa from sqlalchemy.util import unique_list # noqa from .compat import inspect_getfullargspec -from .compat import string_types _T = TypeVar("_T") @@ -209,7 +208,7 @@ def to_tuple(x: Any, default: Optional[tuple] = None) -> tuple: def to_tuple(x, default=None): if x is None: return default - elif isinstance(x, string_types): + elif isinstance(x, str): return (x,) elif isinstance(x, Iterable): return tuple(x) @@ -241,7 +240,7 @@ class Dispatcher: def dispatch(self, obj: Any, qualifier: str = "default") -> Any: - if isinstance(obj, string_types): + if isinstance(obj, str): targets: Sequence = [obj] elif isinstance(obj, type): targets = obj.__mro__ diff --git a/alembic/util/messaging.py b/alembic/util/messaging.py index 062890a..66f8cc2 100644 --- a/alembic/util/messaging.py +++ b/alembic/util/messaging.py @@ -12,8 +12,6 @@ import warnings from sqlalchemy.engine import url from . import sqla_compat -from .compat import binary_type -from .compat import string_types log = logging.getLogger(__name__) @@ -37,7 +35,7 @@ except (ImportError, IOError): def write_outstream(stream: TextIO, *text) -> None: encoding = getattr(stream, "encoding", "ascii") or "ascii" for t in text: - if not isinstance(t, binary_type): + if not isinstance(t, bytes): t = t.encode(encoding, "replace") t = t.decode(encoding) try: @@ -100,7 +98,7 @@ def msg(msg: str, newline: bool = True, flush: bool = False) -> None: def format_as_comma(value: Optional[Union[str, "Iterable[str]"]]) -> str: if value is None: return "" - elif isinstance(value, string_types): + elif isinstance(value, str): return value elif isinstance(value, Iterable): return ", ".join(value) diff --git a/alembic/util/sqla_compat.py b/alembic/util/sqla_compat.py index 221e20e..4d0041e 100644 --- a/alembic/util/sqla_compat.py +++ b/alembic/util/sqla_compat.py @@ -23,8 +23,6 @@ from sqlalchemy.sql.elements import quoted_name from sqlalchemy.sql.elements import TextClause from sqlalchemy.sql.visitors import traverse -from . import compat - if TYPE_CHECKING: from sqlalchemy import Index from sqlalchemy import Table @@ -338,7 +336,7 @@ def _textual_index_column( table: "Table", text_: Union[str, "TextClause", "ColumnElement"] ) -> Union["ColumnElement", "Column"]: """a workaround for the Index construct's severe lack of flexibility""" - if isinstance(text_, compat.string_types): + if isinstance(text_, str): c = Column(text_, sqltypes.NULLTYPE) table.append_column(c) return c |