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

[benjamin.peterson]

http://hg.python.org/cpython/rev/2c21a901717a
changeset:   90109:2c21a901717a
parent:      90107:6154c7f2bf75
parent:      90108:6185b71bdc1c
user:        Benjamin Peterson <benjamin at python.org>
date:        Wed Apr 02 12:05:41 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
@@ -763,7 +763,7 @@
             pass
         self.assertEqual(e, (None, None, None))
 
-    def testUnicodeChangeAttributes(self):
+    def test_unicode_change_attributes(self):
         # See issue 7309. This was a crasher.
 
         u = UnicodeEncodeError('baz', 'xxxxx', 1, 5, 'foo')

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