From 5de71c6302d01d1f304e75aa9e8e5e1bb7538d23 Mon Sep 17 00:00:00 2001 From: Nikita Sobolev Date: Sat, 30 Jul 2022 21:48:26 +0300 Subject: [PATCH] Remove all `__nonzero__` methods (#8308) --- lib/sqlalchemy/event/attr.py | 4 ---- lib/sqlalchemy/ext/associationproxy.py | 4 ---- lib/sqlalchemy/orm/collections.py | 2 -- lib/sqlalchemy/orm/dynamic.py | 2 -- lib/sqlalchemy/sql/elements.py | 2 -- lib/sqlalchemy/sql/lambdas.py | 4 ---- 6 files changed, 18 deletions(-) diff --git a/lib/sqlalchemy/event/attr.py b/lib/sqlalchemy/event/attr.py index 2816998117..f8d70a06a6 100644 --- a/lib/sqlalchemy/event/attr.py +++ b/lib/sqlalchemy/event/attr.py @@ -398,8 +398,6 @@ class _EmptyListener(_InstanceLevelDispatch[_ET]): def __bool__(self) -> bool: return bool(self.parent_listeners) - __nonzero__ = __bool__ - class _MutexProtocol(Protocol): def __enter__(self) -> bool: @@ -509,8 +507,6 @@ class _CompoundListener(_InstanceLevelDispatch[_ET]): def __bool__(self) -> bool: return bool(self.listeners or self.parent_listeners) - __nonzero__ = __bool__ - class _ListenerCollection(_CompoundListener[_ET]): """Instance-level attributes on instances of :class:`._Dispatch`. diff --git a/lib/sqlalchemy/ext/associationproxy.py b/lib/sqlalchemy/ext/associationproxy.py index 7db95eac9b..f238f4f8ae 100644 --- a/lib/sqlalchemy/ext/associationproxy.py +++ b/lib/sqlalchemy/ext/associationproxy.py @@ -1316,8 +1316,6 @@ class _AssociationCollection(Generic[_IT]): def __bool__(self) -> bool: return bool(self.col) - __nonzero__ = __bool__ - def __getstate__(self) -> Any: return {"parent": self.parent, "lazy_collection": self.lazy_collection} @@ -1749,8 +1747,6 @@ class _AssociationSet(_AssociationSingleItem[_T], MutableSet[_T]): else: return False - __nonzero__ = __bool__ - def __contains__(self, __o: object) -> bool: for member in self.col: if self._get(member) == __o: diff --git a/lib/sqlalchemy/orm/collections.py b/lib/sqlalchemy/orm/collections.py index 78fe89d05f..f47d00634e 100644 --- a/lib/sqlalchemy/orm/collections.py +++ b/lib/sqlalchemy/orm/collections.py @@ -614,8 +614,6 @@ class CollectionAdapter: def __bool__(self): return True - __nonzero__ = __bool__ - def fire_append_wo_mutation_event(self, item, initiator=None): """Notify that a entity is entering the collection but is already present. diff --git a/lib/sqlalchemy/orm/dynamic.py b/lib/sqlalchemy/orm/dynamic.py index 084ba969fb..8663389bc3 100644 --- a/lib/sqlalchemy/orm/dynamic.py +++ b/lib/sqlalchemy/orm/dynamic.py @@ -337,8 +337,6 @@ class DynamicCollectionAdapter: def __bool__(self): return True - __nonzero__ = __bool__ - class AppenderMixin: query_class = None diff --git a/lib/sqlalchemy/sql/elements.py b/lib/sqlalchemy/sql/elements.py index 9db90cb02b..71459f6794 100644 --- a/lib/sqlalchemy/sql/elements.py +++ b/lib/sqlalchemy/sql/elements.py @@ -696,8 +696,6 @@ class ClauseElement( def __bool__(self): raise TypeError("Boolean value of this clause is not defined") - __nonzero__ = __bool__ - def __repr__(self): friendly = self.description if friendly is None: diff --git a/lib/sqlalchemy/sql/lambdas.py b/lib/sqlalchemy/sql/lambdas.py index c7464c91cb..bbfaf47e1b 100644 --- a/lib/sqlalchemy/sql/lambdas.py +++ b/lib/sqlalchemy/sql/lambdas.py @@ -1341,10 +1341,6 @@ class PyWrapper(ColumnOperators): to_evaluate = object.__getattribute__(self, "_to_evaluate") return bool(to_evaluate) - def __nonzero__(self): - to_evaluate = object.__getattribute__(self, "_to_evaluate") - return bool(to_evaluate) - def __getattribute__(self, key): if key.startswith("_sa_"): return object.__getattribute__(self, key[4:]) -- 2.47.2