From: Victor Stinner <victor.stinner@haypocalc.com>
Date: Mon, 16 May 2011 14:45:15 +0000 (+0200)
Subject: (Merge 3.1) Issue #12057: Convert CJK encoding testcase BLOB into multiple text
X-Git-Tag: v3.2.1rc2~153
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b67cf161bc5f2f581ac2c04546396ca9e149b4de;p=thirdparty%2FPython%2Fcpython.git

(Merge 3.1) Issue #12057: Convert CJK encoding testcase BLOB into multiple text
files
---

b67cf161bc5f2f581ac2c04546396ca9e149b4de
diff --cc Lib/test/test_multibytecodec_support.py
index ed15ce1d3d1f,75e95ca9967c..a48fbe4813df
--- a/Lib/test/test_multibytecodec_support.py
+++ b/Lib/test/test_multibytecodec_support.py
@@@ -4,9 -4,11 +4,12 @@@
  #   Common Unittest Routines for CJK codecs
  #
  
- import sys, codecs
- import unittest, re
+ import codecs
+ import os
+ import re
+ import sys
+ import unittest
 +from http.client import HTTPException
  from test import support
  from io import BytesIO