[Python-checkins] cpython (merge 3.4 -> default): merge 3.4

[benjamin.peterson]

http://hg.python.org/cpython/rev/c9cb931b20f4
changeset:   90115:c9cb931b20f4
parent:      90112:0aeaea247d7d
parent:      90113:095fbf03cad7
user:        Benjamin Peterson <benjamin at python.org>
date:        Wed Apr 02 15:52:04 2014 -0400
summary:
  merge 3.4

files:
  Lib/test/test_exceptions.py |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Lib/test/test_exceptions.py b/Lib/test/test_exceptions.py
--- a/Lib/test/test_exceptions.py
+++ b/Lib/test/test_exceptions.py
@@ -802,7 +802,7 @@
 
     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)), "")
 

-- 
Repository URL: http://hg.python.org/cpython