merge 3.4

This commit is contained in:
Benjamin Peterson 2014-04-02 15:52:04 -04:00
commit 9f0218bebe

View file

@ -802,7 +802,7 @@ class ExceptionTests(unittest.TestCase):
def test_unicode_errors_no_object(self):
# See issue #21134.
klasses = UnicodeDecodeError, UnicodeDecodeError, UnicodeTranslateError
klasses = UnicodeEncodeError, UnicodeDecodeError, UnicodeTranslateError
for klass in klasses:
self.assertEqual(str(klass.__new__(klass)), "")