Merge fix for broken/disabled test.

diff --cc Lib/test/test_codecs.py
index 15cd687530a39910dcde1d0f87e30aa7dddc17ed,acf9f64b6b932aaefeca315cd82933f44f1ce97c..8328a2209bf73b4430f63b68d82dfe3f3371f768
--- 1/Lib/test/test_codecs.py
--- 2/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,