Merge pull request #8803 from gabriel-munteanu/pypy-compatibility

anntzer · web-flow · commit 6c51037864f9 · 2017-06-27T11:07:24.000-07:00
Catch exception for PyPy
diff --git a/lib/matplotlib/cbook/deprecation.py b/lib/matplotlib/cbook/deprecation.py
@@ -174,8 +174,10 @@ def deprecate(obj, message=message, name=name, alternative=alternative,
             def finalize(wrapper, new_doc):
                 try:
                     obj.__doc__ = new_doc
-                except AttributeError:
-                    pass  # cls.__doc__ is not writeable on Py2.
+                except (AttributeError, TypeError):
+                    # cls.__doc__ is not writeable on Py2.
+                    # TypeError occurs on PyPy
+                    pass
                 obj.__init__ = wrapper
                 return obj
         else:
