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

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

651e1a2e63001dfe1d2b3c4b8bdbd5b908b85aa9
diff --cc .hgeol
index 0b0841beeca1,ed13171b72a2..afb1e6b16e52
--- a/.hgeol
+++ b/.hgeol
@@@ -27,9 -27,9 +27,10 @@@
  **.zip  = BIN
  
  Lib/email/test/data/msg_26.txt = BIN
- Lib/test/test_email/data/msg_26.txt = BIN
- Lib/test/sndhdrdata/sndhdr.* = BIN
+ Lib/test/cjkencodings/* = BIN
 -Lib/test/sndhdrdata/sndhdr.* = BIN
  Lib/test/decimaltestdata/*.decTest = BIN
++Lib/test/sndhdrdata/sndhdr.* = BIN
++Lib/test/test_email/data/msg_26.txt = BIN
  
  # All other files (which presumably are human-editable) are "native".
  # This must be the last rule!