[pypy-commit] pypy stdlib-2.7.12: TypeError's acceptable on 2.x

[pjenvey]

Author: Philip Jenvey <pjenvey at underboss.org>
Branch: stdlib-2.7.12
Changeset: r87534:ad6aff1e8434
Date: 2016-10-02 20:28 -0700
http://bitbucket.org/pypy/pypy/changeset/ad6aff1e8434/

Log:	TypeError's acceptable on 2.x

diff --git a/lib-python/2.7/test/test_builtin.py b/lib-python/2.7/test/test_builtin.py
--- a/lib-python/2.7/test/test_builtin.py
+++ b/lib-python/2.7/test/test_builtin.py
@@ -1767,7 +1767,7 @@
 
         A = type('A', (), {})
         self.assertEqual(A.__doc__, None)
-        with self.assertRaises(AttributeError):
+        with self.assertRaises((AttributeError, TypeError)):
             A.__doc__ = 'x'
 
     def test_bad_args(self):