summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorPhilip Jenvey <pjenvey@underboss.org>2010-06-09 17:56:11 (GMT)
committerPhilip Jenvey <pjenvey@underboss.org>2010-06-09 17:56:11 (GMT)
commitddf0d0383cf0f262232e7f336f1a6da0c61be966 (patch)
treefb89ca64fac655c141604b60b9c3d6f3eb18e424 /Lib
parenta57aae7d47a20b2cb579b51192d39b9d0521c979 (diff)
downloadcpython-ddf0d0383cf0f262232e7f336f1a6da0c61be966.zip
cpython-ddf0d0383cf0f262232e7f336f1a6da0c61be966.tar.gz
cpython-ddf0d0383cf0f262232e7f336f1a6da0c61be966.tar.bz2
Merged revisions 79780 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k ................ r79780 | philip.jenvey | 2010-04-04 20:05:24 -0700 (Sun, 04 Apr 2010) | 9 lines Merged revisions 79779 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r79779 | philip.jenvey | 2010-04-04 19:51:51 -0700 (Sun, 04 Apr 2010) | 2 lines fix escape_encode to return the correct consumed size ........ ................
Diffstat (limited to 'Lib')
-rw-r--r--Lib/test/test_codecs.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/Lib/test/test_codecs.py b/Lib/test/test_codecs.py
index 5d6b545..5db5dcb 100644
--- a/Lib/test/test_codecs.py
+++ b/Lib/test/test_codecs.py
@@ -915,6 +915,8 @@ class UnicodeInternalTest(unittest.TestCase):
self.assertEquals(encoder("a")[1], 1)
self.assertEquals(encoder("\xe9\u0142")[1], 2)
+ self.assertEquals(codecs.escape_encode(br'\x00')[1], 4)
+
# From http://www.gnu.org/software/libidn/draft-josefsson-idn-test-vectors.html
nameprep_tests = [
# 3.1 Map to nothing.