summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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_