From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Fri, 11 Jan 2013 03:57:58 +0000 (+0200)
Subject: Merge fix for broken/disabled test.
X-Git-Tag: v3.3.1rc1~390
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e0b87edd7f6a4893cd814186d8484a88a3649317;p=thirdparty%2FPython%2Fcpython.git

Merge fix for broken/disabled test.
---

e0b87edd7f6a4893cd814186d8484a88a3649317
diff --cc Lib/test/test_codecs.py
index 15cd687530a3,acf9f64b6b93..8328a2209bf7
--- a/Lib/test/test_codecs.py
+++ b/Lib/test/test_codecs.py
@@@ -2217,7 -1905,7 +2217,8 @@@ def test_main()
          UTF16BETest,
          UTF8Test,
          UTF8SigTest,
+         EscapeDecodeTest,
 +        CP65001Test,
          UTF7Test,
          UTF16ExTest,
          ReadBufferTest,