commit e0b87edd7f6a4893cd814186d8484a88a3649317
author Ezio Melotti <ezio.melotti@gmail.com> Fri Jan 11 05:57:58 2013 +0200
committer Ezio Melotti <ezio.melotti@gmail.com> Fri Jan 11 05:57:58 2013 +0200
tree 7e25a5e9265f80c83002621bcec9c63d1bff1365
parent 90bbbd11648e8d64013369a595b982788fa89819
parent 26ed234052db568379efd2cc00d5850dd00b13f7

Merge fix for broken/disabled test.

Lib/test/test_codecs.py

diff --git a/Lib/test/test_codecs.py b/Lib/test/test_codecs.py
index 15cd687..8328a22 100644
--- a/Lib/test/test_codecs.py
+++ b/Lib/test/test_codecs.py
@@ -925,7 +925,7 @@
 
 class EscapeDecodeTest(unittest.TestCase):
     def test_empty(self):
-        self.assertEqual(codecs.escape_decode(""), ("", 0))
+        self.assertEqual(codecs.escape_decode(""), (b"", 0))
 
 class RecodingTest(unittest.TestCase):
     def test_recoding(self):
@@ -2217,6 +2217,7 @@
         UTF16BETest,
         UTF8Test,
         UTF8SigTest,
+        EscapeDecodeTest,
         CP65001Test,
         UTF7Test,
         UTF16ExTest,