Merge "Remove obsolete util.compat.nested"

3 files changed, 8 insertions, 47 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()
diff --git a/test/engine/test_execute.py b/test/engine/test_execute.py
index 5acd14177..bad6c1603 100644
--- a/test/engine/test_execute.py
+++ b/test/engine/test_execute.py
@@ -47,7 +47,6 @@ from sqlalchemy.testing.schema import Column
 from sqlalchemy.testing.schema import Table
 from sqlalchemy.testing.util import gc_collect
 from sqlalchemy.testing.util import picklers
-from sqlalchemy.util import nested
 
 
 users, metadata, users_autoinc = None, None, None
@@ -348,16 +347,14 @@ class ExecuteTest(fixtures.TestBase):
         class NonStandardException(OperationalError):
             pass
 
-        with nested(
-            patch.object(testing.db.dialect, "dbapi", Mock(Error=DBAPIError)),
-            patch.object(
-                testing.db.dialect, "is_disconnect", lambda *arg: False
-            ),
-            patch.object(
-                testing.db.dialect,
-                "do_execute",
-                Mock(side_effect=NonStandardException),
-            ),
+        with patch.object(
+            testing.db.dialect, "dbapi", Mock(Error=DBAPIError)
+        ), patch.object(
+            testing.db.dialect, "is_disconnect", lambda *arg: False
+        ), patch.object(
+            testing.db.dialect,
+            "do_execute",
+            Mock(side_effect=NonStandardException),
         ):
             with testing.db.connect() as conn:
                 assert_raises(