summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2017-07-24 12:13:05 -0400
committerMike Bayer <mike_mp@zzzcomputing.com>2017-07-24 12:31:44 -0400
commit7d4005156b5a48989dae7c4424faafc03cc8410d (patch)
treeadae4cdfa14c25d1563f7ad1fb561a62f814bfd1
parent8d4a4049f4b210637ff403aa77f871788ba94b28 (diff)
downloadsqlalchemy-7d4005156b5a48989dae7c4424faafc03cc8410d.tar.gz
Ensure we check for boolean condition when we inspect __exit__()
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
-rw-r--r--doc/build/changelog/unreleased_10/4034.rst7
-rw-r--r--lib/sqlalchemy/testing/util.py2
2 files changed, 8 insertions, 1 deletions
diff --git a/doc/build/changelog/unreleased_10/4034.rst b/doc/build/changelog/unreleased_10/4034.rst
new file mode 100644
index 000000000..ac4f229b0
--- /dev/null
+++ b/doc/build/changelog/unreleased_10/4034.rst
@@ -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
diff --git a/lib/sqlalchemy/testing/util.py b/lib/sqlalchemy/testing/util.py
index a37637ac0..fe696bcd4 100644
--- a/lib/sqlalchemy/testing/util.py
+++ b/lib/sqlalchemy/testing/util.py
@@ -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_