Commit Graph

7 Commits

Author SHA1 Message Date
Benjamin Peterson 669ff66c32 remove duplicated imports (closes #25502) 2015-10-28 23:15:13 -07:00
Collin Winter b13c493ae5 Fix more lingering print statements. 2007-08-30 18:50:25 +00:00
Thomas Wouters 49fd7fa443 Merge p3yk branch with the trunk up to revision 45595. This breaks a fair
number of tests, all because of the codecs/_multibytecodecs issue described
here (it's not a Py3K issue, just something Py3K discovers):
http://mail.python.org/pipermail/python-dev/2006-April/064051.html

Hye-Shik Chang promised to look for a fix, so no need to fix it here. The
tests that are expected to break are:

test_codecencodings_cn
test_codecencodings_hk
test_codecencodings_jp
test_codecencodings_kr
test_codecencodings_tw
test_codecs
test_multibytecodec

This merge fixes an actual test failure (test_weakref) in this branch,
though, so I believe merging is the right thing to do anyway.
2006-04-21 10:40:58 +00:00
Tim Peters fe8a56680a Remove svn:mime-type (inexplicably set to a binary type),
and set svn:eol-style to native, on some text files.
2006-03-01 06:28:58 +00:00
Tim Peters 3d7d372ce3 Whitespace normalization, via reindent.py. 2004-07-18 06:25:50 +00:00
Guido van Rossum 1aa7e3a177 Jim Ahlstrom's contributions for DOS, OS/2, WIN3.1. 1997-05-19 14:16:21 +00:00
Guido van Rossum 1bc716f2fc Added PC files from Jim Ahlstrom. 1996-06-28 19:12:06 +00:00