summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2014-04-02 16:05:41 (GMT)
committerBenjamin Peterson <benjamin@python.org>2014-04-02 16:05:41 (GMT)
commitf93c27eb53cd6ff3c6e7e5e8528a7e876cb6213e (patch)
tree10e6b99bcae41531a40482419cd5fe39cd15cd89
parent0ac8e47149b41eea06d5782cf0df91ae5915ee29 (diff)
parent24dfb05d4f7de2d28db2c69560d3afa8f612242c (diff)
downloadcpython-f93c27eb53cd6ff3c6e7e5e8528a7e876cb6213e.zip
cpython-f93c27eb53cd6ff3c6e7e5e8528a7e876cb6213e.tar.gz
cpython-f93c27eb53cd6ff3c6e7e5e8528a7e876cb6213e.tar.bz2
merge 3.4
-rw-r--r--Lib/test/test_exceptions.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/test/test_exceptions.py b/Lib/test/test_exceptions.py
index 62a2e32..80e921a 100644
--- a/Lib/test/test_exceptions.py
+++ b/Lib/test/test_exceptions.py
@@ -763,7 +763,7 @@ class ExceptionTests(unittest.TestCase):
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')