summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/util
diff options
context:
space:
mode:
authormike bayer <mike_mp@zzzcomputing.com>2020-03-02 19:21:24 +0000
committerGerrit Code Review <gerrit@bbpush.zzzcomputing.com>2020-03-02 19:21:24 +0000
commit2d052d43518a0f4d9751db7e699cfebd3724c1e5 (patch)
treecada570a160fe7553b256fd001498afac5fad678 /lib/sqlalchemy/util
parent3dd23a57b1b7985963b633730776d6923d024966 (diff)
parent49d78c335403802b8035d0d6f61c92b3f7969174 (diff)
downloadsqlalchemy-2d052d43518a0f4d9751db7e699cfebd3724c1e5.tar.gz
Merge "Remove obsolete util.compat.nested"
Diffstat (limited to 'lib/sqlalchemy/util')
-rw-r--r--lib/sqlalchemy/util/__init__.py1
-rw-r--r--lib/sqlalchemy/util/compat.py35
2 files changed, 0 insertions, 36 deletions
diff --git a/lib/sqlalchemy/util/__init__.py b/lib/sqlalchemy/util/__init__.py
index b0ceb802a..b4610a1b0 100644
--- a/lib/sqlalchemy/util/__init__.py
+++ b/lib/sqlalchemy/util/__init__.py
@@ -58,7 +58,6 @@ from .compat import iterbytes # noqa
from .compat import itertools_filter # noqa
from .compat import itertools_filterfalse # noqa
from .compat import namedtuple # noqa
-from .compat import nested # noqa
from .compat import next # noqa
from .compat import parse_qsl # noqa
from .compat import pickle # noqa
diff --git a/lib/sqlalchemy/util/compat.py b/lib/sqlalchemy/util/compat.py
index 8967955cd..104e8e03d 100644
--- a/lib/sqlalchemy/util/compat.py
+++ b/lib/sqlalchemy/util/compat.py
@@ -369,41 +369,6 @@ else:
import collections as collections_abc # noqa
-@contextlib.contextmanager
-def nested(*managers):
- """Implement contextlib.nested, mostly for unit tests.
-
- As tests still need to run on py2.6 we can't use multiple-with yet.
-
- Function is removed in py3k but also emits deprecation warning in 2.7
- so just roll it here for everyone.
-
- """
-
- exits = []
- vars_ = []
- exc = (None, None, None)
- try:
- for mgr in managers:
- exit_ = mgr.__exit__
- enter = mgr.__enter__
- vars_.append(enter())
- exits.append(exit_)
- yield vars_
- except:
- exc = sys.exc_info()
- finally:
- while exits:
- exit_ = exits.pop() # noqa
- try:
- if exit_(*exc):
- exc = (None, None, None)
- except:
- exc = sys.exc_info()
- if exc != (None, None, None):
- reraise(exc[0], exc[1], exc[2])
-
-
def raise_from_cause(exception, exc_info=None):
if exc_info is None:
exc_info = sys.exc_info()