[Python-checkins] cpython (merge 3.3 -> default): Merge fix from 3.3 into default.

tim.peters python-checkins at python.org
Sun Sep 1 23:02:17 CEST 2013


http://hg.python.org/cpython/rev/25211a22228b
changeset:   85495:25211a22228b
parent:      85493:267e09700978
parent:      85494:8efcf3c823f9
user:        Tim Peters <tim at python.org>
date:        Sun Sep 01 16:01:46 2013 -0500
summary:
  Merge fix from 3.3 into default.

Fix issue 18889: test_sax: multiple failures on Windows desktop.

"The fix" is to tell Mercurial that the test files are binary.

Windows developers:  to get the correct line endings in your checkout,
delete Lib\test\xmltestdata, and then "hg revert" that directory.

Why the Windows buildbots didn't fail test_sax remains a mystery :-(

files:
  .hgeol |  1 +
  1 files changed, 1 insertions(+), 0 deletions(-)


diff --git a/.hgeol b/.hgeol
--- a/.hgeol
+++ b/.hgeol
@@ -31,6 +31,7 @@
 Lib/test/decimaltestdata/*.decTest = BIN
 Lib/test/sndhdrdata/sndhdr.* = BIN
 Lib/test/test_email/data/msg_26.txt = BIN
+Lib/test/xmltestdata/* = BIN
 
 Lib/venv/scripts/nt/* = BIN
 

-- 
Repository URL: http://hg.python.org/cpython


More information about the Python-checkins mailing list