Commit Graph

14 Commits

Author SHA1 Message Date
Martin v. Löwis
78f1e4c865 Merge with 3.3 2014-02-28 15:43:36 +01:00
Martin v. Löwis
815b41b1cd Issue #20731: Properly position in source code files even if they
are opened in text mode. Patch by Serhiy Storchaka.
2014-02-28 15:27:29 +01:00
Nick Coghlan
d0cf0635b3 Close #19406: Initial implementation of ensurepip
Patch by Donald Stufft and Nick Coghlan
2013-11-11 22:11:55 +10:00
Benjamin Peterson
f54ab1f5b1 backport media types from default 2013-10-12 15:54:05 -04:00
Terry Jan Reedy
a0f482a7ff Remove obsolete .hgeol entry pointing to file moved elsewhere.
This kine was already replaced by
Lib/test/test_email/data/msg_26.txt = BIN
which is just below the last line in the patch context.
2013-09-01 19:03:41 -04:00
Tim Peters
9d2e3a1e2f 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 :-(
2013-09-01 15:56:22 -05:00
Vinay Sajip
f2bdc3690a Updated .hgeol for additional binaries. 2012-05-26 03:25:23 +01:00
Victor Stinner
651e1a2e63 (Merge 3.2) Issue #12057: Convert CJK encoding testcase BLOB into multiple text
files
2011-05-16 16:50:23 +02:00
Victor Stinner
033a543ab1 Issue #12057: Convert CJK encoding testcase BLOB into multiple text files 2011-05-16 16:43:38 +02:00
R David Murray
76a3d73cbd Prepare for move of email tests. 2011-03-21 16:01:23 -04:00
Georg Brandl
5537d298ea Add updated .hgeol file and fix newlines in the 3.1 branch. 2011-03-05 15:10:38 +01:00
Antoine Pitrou
59db1f3df6 Fix .hgeol 2011-02-25 14:32:24 +00:00
Georg Brandl
d62ecbf0ba Merged revisions 85728,85731,85735,85766-85771,85773,85777 via svnmerge from
svn+ssh://svn.python.org/python/branches/py3k

........
  r85728 | georg.brandl | 2010-10-19 20:54:25 +0200 (Di, 19 Okt 2010) | 1 line

  #10092: Properly reset locale in Locale*Calendar classes.  The context manager was buggy because setlocale() returns the *new* locale, not the old.  Also add a test for this.
........
  r85731 | georg.brandl | 2010-10-19 23:07:16 +0200 (Di, 19 Okt 2010) | 1 line

  Be consistent in the spelling of thread-safe(ty).
........
  r85735 | georg.brandl | 2010-10-20 08:50:19 +0200 (Mi, 20 Okt 2010) | 1 line

  Fix r85728: use "" to mean the system default locale, which should work on more systems.
........
  r85766 | georg.brandl | 2010-10-21 09:40:03 +0200 (Do, 21 Okt 2010) | 1 line

  #10159: sort completion matches before comparing to dir() result.
........
  r85767 | georg.brandl | 2010-10-21 14:49:28 +0200 (Do, 21 Okt 2010) | 1 line

  #9095, #8912, #8999: add support in patchcheck for Mercurial checkouts, C file reindenting, and docs whitespace fixing.
........
  r85768 | georg.brandl | 2010-10-21 14:59:14 +0200 (Do, 21 Okt 2010) | 1 line

  #9919: fix off-by-one error in lineno command in Misc/gdbinit; also add newline to its output.
........
  r85769 | georg.brandl | 2010-10-21 15:01:23 +0200 (Do, 21 Okt 2010) | 1 line

  Fix missing import.
........
  r85770 | georg.brandl | 2010-10-21 15:29:10 +0200 (Do, 21 Okt 2010) | 1 line

  #3077: fix h2py substitution of character literals.
........
  r85771 | georg.brandl | 2010-10-21 15:34:51 +0200 (Do, 21 Okt 2010) | 1 line

  #1203650: allow larger list of files in windows makefile for freeze.
........
  r85773 | georg.brandl | 2010-10-21 15:45:52 +0200 (Do, 21 Okt 2010) | 1 line

  #4829: better error message for invalid file mode
........
  r85777 | georg.brandl | 2010-10-21 17:44:51 +0200 (Do, 21 Okt 2010) | 1 line

  Add .hgeol file for the Mercurial EOL extension.
........
2010-11-26 08:52:36 +00:00
Georg Brandl
2efeb40d5f Add .hgeol file for the Mercurial EOL extension. 2010-10-21 15:44:51 +00:00