summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Peters <tim@python.org>2013-09-01 21:01:46 (GMT)
committerTim Peters <tim@python.org>2013-09-01 21:01:46 (GMT)
commit56dadf7d021691634d52b8b310cdd4a1fe872c65 (patch)
tree74651f43bc2196a1e5ee783b27cf87e2a896e0ea
parent625eed765a5f46794018c7484b0985c93a620022 (diff)
parent9d2e3a1e2f248c75bd73874ac42ba77d4f7c4854 (diff)
downloadcpython-56dadf7d021691634d52b8b310cdd4a1fe872c65.zip
cpython-56dadf7d021691634d52b8b310cdd4a1fe872c65.tar.gz
cpython-56dadf7d021691634d52b8b310cdd4a1fe872c65.tar.bz2
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 :-(
-rw-r--r--.hgeol1
1 files changed, 1 insertions, 0 deletions
diff --git a/.hgeol b/.hgeol
index 64bb7cf..c3788ce 100644
--- a/.hgeol
+++ b/.hgeol
@@ -31,6 +31,7 @@ Lib/test/cjkencodings/* = BIN
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