]> git.ipfire.org Git - thirdparty/sqlalchemy/sqlalchemy.git/commitdiff
Ensure we check for boolean condition when we inspect __exit__()
authorMike Bayer <mike_mp@zzzcomputing.com>
Mon, 24 Jul 2017 16:13:05 +0000 (12:13 -0400)
committerMike Bayer <mike_mp@zzzcomputing.com>
Mon, 24 Jul 2017 16:31:44 +0000 (12:31 -0400)
Fixed issue in testing fixtures which was incompatible with a change
made as of Python 3.6.2 involving context managers.

Change-Id: I0f12aa6cc15cba89153f7e4888ac347e7ce599c7
Fixes: #4034
doc/build/changelog/unreleased_10/4034.rst [new file with mode: 0644]
lib/sqlalchemy/testing/util.py

diff --git a/doc/build/changelog/unreleased_10/4034.rst b/doc/build/changelog/unreleased_10/4034.rst
new file mode 100644 (file)
index 0000000..ac4f229
--- /dev/null
@@ -0,0 +1,7 @@
+.. change::
+    :tags: bug, tests, py3k
+    :tickets: 4034
+    :versions: 1.0.18, 1.1.12, 1.2.0b2
+
+    Fixed issue in testing fixtures which was incompatible with a change
+    made as of Python 3.6.2 involving context managers.
\ No newline at end of file
index a37637ac02974dd79828cd0d32948a6697e455b4..fe696bcd48e897622b04518ebe6b394f87e9f599 100644 (file)
@@ -161,7 +161,7 @@ def run_as_contextmanager(ctx, fn, *arg, **kw):
     except:
         exc_info = sys.exc_info()
         raise_ = ctx.__exit__(*exc_info)
-        if raise_ is None:
+        if not raise_:
             raise
         else:
             return raise_