Merge branch '0.11-maintenance'

CHANGES

@@ -12,6 +12,13 @@ Version 0.12
 - Make ``flask.safe_join`` able to join multiple paths like ``os.path.join``
   (pull request ``#1730``).
 
+Version 0.11.2
+--------------
+
+Bugfix release, unreleased
+
+- Fix crash when running under PyPy3, see pull request ``#1814``.
+
 Version 0.11.1
 --------------
 

flask/_compat.py

@@ -65,17 +65,25 @@ def with_metaclass(meta, *bases):
 
 
 # Certain versions of pypy have a bug where clearing the exception stack
-# breaks the __exit__ function in a very peculiar way.  This is currently
+# breaks the __exit__ function in a very peculiar way.  The second level of
-# true for pypy 2.2.1 for instance.  The second level of exception blocks
+# exception blocks is necessary because pypy seems to forget to check if an
-# is necessary because pypy seems to forget to check if an exception
+# exception happened until the next bytecode instruction?
-# happened until the next bytecode instruction?
+#
+# Relevant PyPy bugfix commit:
+# https://bitbucket.org/pypy/pypy/commits/77ecf91c635a287e88e60d8ddb0f4e9df4003301
+# According to ronan on #pypy IRC, it is released in PyPy2 2.3 and later
+# versions.
+#
+# Ubuntu 14.04 has PyPy 2.2.1, which does exhibit this bug.
 BROKEN_PYPY_CTXMGR_EXIT = False
 if hasattr(sys, 'pypy_version_info'):
     class _Mgr(object):
         def __enter__(self):
             return self
         def __exit__(self, *args):
-            sys.exc_clear()
+            if hasattr(sys, 'exc_clear'):
+                # Python 3 (PyPy3) doesn't have exc_clear
+                sys.exc_clear()
     try:
         try:
             with _Mgr():