Benjamin Peterson ffa94b0f02 Merged revisions 77102 via svnmerge from ... svn+ssh://pythondev@svn.python.org/python/trunk ................ r77102 | benjamin.peterson | 2009-12-28 17:50:41 -0600 (Mon, 28 Dec 2009) | 50 lines Merged revisions 76871-76872,77093-77095,77097-77101 via svnmerge from svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3 ........ r76871 | benjamin.peterson | 2009-12-17 20:49:21 -0600 (Thu, 17 Dec 2009) | 1 line handle unencodable diffs gracefully #5093 ........ r76872 | benjamin.peterson | 2009-12-17 20:51:37 -0600 (Thu, 17 Dec 2009) | 1 line fix emacs header ........ r77093 | benjamin.peterson | 2009-12-28 14:43:32 -0600 (Mon, 28 Dec 2009) | 7 lines replace callable(x) with isinstance(x, collections.Callable) #7006 This is a more accurate translation than hasattr(x, '__call__') which failed in the case that somebody had put __call__ in the instance dictionary. Patch mostly by Joe Amenta. ........ r77094 | benjamin.peterson | 2009-12-28 14:45:13 -0600 (Mon, 28 Dec 2009) | 2 lines deuglify imports ........ r77095 | benjamin.peterson | 2009-12-28 14:49:23 -0600 (Mon, 28 Dec 2009) | 1 line remove unused flag ........ r77097 | benjamin.peterson | 2009-12-28 16:12:13 -0600 (Mon, 28 Dec 2009) | 2 lines clean up imports and whitespace ........ r77098 | benjamin.peterson | 2009-12-28 16:43:35 -0600 (Mon, 28 Dec 2009) | 1 line *** empty log message *** ........ r77099 | benjamin.peterson | 2009-12-28 16:45:10 -0600 (Mon, 28 Dec 2009) | 1 line revert unintended change ........ r77100 | benjamin.peterson | 2009-12-28 16:53:21 -0600 (Mon, 28 Dec 2009) | 1 line revert unintended changes ........ r77101 | benjamin.peterson | 2009-12-28 17:46:02 -0600 (Mon, 28 Dec 2009) | 1 line normalize whitespace ........ ................		2009-12-29 00:06:20 +00:00
..
ctypes	Changed try/finally to contextlib.closing, as discussed in issue 6882.	2009-10-23 12:56:11 +00:00
curses	Merged revisions 64623,64640,64665,64687,64689-64690,64719,64721,64735,64742,64744-64746,64756-64761,64767-64769,64771-64772,64774-64775,64788,64793,64835-64836 via svnmerge from	2008-07-16 03:43:04 +00:00
dbm	Redundancy isn't needed here.	2009-10-10 21:28:29 +00:00
distutils	Fix merge issue where I forgot to replace sys.maxint by sys.maxsize.	2009-12-26 13:16:15 +00:00
email	Add mktime_tz to __all__. It's documented as being available in email.utils.	2009-11-25 18:45:15 +00:00
encodings	Fix a minor grammatical error.	2009-12-13 21:25:28 +00:00
html	#2834: Change re module semantics, so that str and bytes mixing is forbidden,	2008-08-19 17:56:33 +00:00
http	Merged revisions 76908 via svnmerge from	2009-12-20 07:10:31 +00:00
idlelib	Merged revisions 77031 via svnmerge from	2009-12-24 14:03:19 +00:00
importlib	Clarify importlib.abc.PyPycLoader.write_bytecode().	2009-12-12 22:35:59 +00:00
json	Merged revisions 76708 via svnmerge from	2009-12-08 15:57:31 +00:00
lib2to3	Merged revisions 77102 via svnmerge from	2009-12-29 00:06:20 +00:00
logging	logging: Improved support for SMTP over TLS.	2009-12-06 18:05:04 +00:00
msilib	Merged revisions 73390 via svnmerge from	2009-06-12 17:31:41 +00:00
multiprocessing	Merged revisions 76245 via svnmerge from	2009-11-13 22:35:18 +00:00
plat-aix4	…
plat-darwin	These are present in the trunk but no longer in 3.x, which causes problems	2009-03-04 23:21:07 +00:00
plat-freebsd4	…
plat-freebsd5	…
plat-freebsd6	…
plat-freebsd7	…
plat-freebsd8	…
plat-generic	…
plat-linux2	…
plat-netbsd1	…
plat-next3	…
plat-os2emx	Merged revisions 62021,62029,62035-62038,62043-62044,62052-62053 via svnmerge from	2008-03-31 01:51:45 +00:00
plat-sunos5	…
plat-unixware7	…
pydoc_data	update pydoc-topics	2009-06-26 13:05:03 +00:00
site-packages	…
sqlite3	Merged revisions 74754 via svnmerge from	2009-09-12 18:41:20 +00:00
test	Merged revisions 77088 via svnmerge from	2009-12-28 08:41:01 +00:00
tkinter	Merged revisions 74507-74511,74517 via svnmerge from	2009-08-18 15:35:57 +00:00
unittest	Merged revisions 76052,76522,76591,76689,76697,76733 via svnmerge from	2009-12-13 02:10:36 +00:00
urllib	Merged revisions 77058 via svnmerge from	2009-12-27 10:13:39 +00:00
wsgiref	Use true booleans and PEP8 for argdefaults.	2009-09-16 15:54:04 +00:00
xml	Merged revisions 75149,75260-75263,75265-75267,75292,75300,75376,75405,75429-75433,75437,75445,75501,75551,75572,75589-75591,75657,75742,75868,75952-75957,76057,76105,76139,76143,76162,76223 via svnmerge from	2009-11-13 02:25:08 +00:00
xmlrpc	Merged revisions 74558 via svnmerge from	2009-12-16 10:50:44 +00:00
__future__.py	barry has already been causing test breakage	2009-04-01 20:38:13 +00:00
__phello__.foo.py	…
_abcoll.py	Issue 6037: MutableSequence.__iadd__ should return self.	2009-05-18 15:35:26 +00:00
_compat_pickle.py	Issue #6137: The pickle module now translates module names when loading	2009-06-04 20:32:06 +00:00
_dummy_thread.py	Merged revisions 65787 via svnmerge from	2008-08-17 22:31:15 +00:00
_markupbase.py	Remove the htmllib and sgmllib modules as per PEP 3108.	2008-06-01 21:25:55 +00:00
_pyio.py	Merged revisions 76896,76898 via svnmerge from	2009-12-19 21:08:31 +00:00
_strptime.py	The message for the exception when time.strptime was passed something other	2009-03-31 03:58:04 +00:00
_threading_local.py	Merged revisions 76117 via svnmerge from	2009-11-05 13:49:14 +00:00
_weakrefset.py	Issue 5964: Fixed WeakSet __eq__ comparison to handle non-WeakSet objects.	2009-05-17 17:32:20 +00:00
abc.py	Merged revisions 72278 via svnmerge from	2009-05-04 16:10:10 +00:00
aifc.py	Merged revisions 72425-72426 via svnmerge from	2009-05-07 18:24:38 +00:00
antigravity.py	Another hidden treasure.	2009-06-03 17:21:17 +00:00
ast.py	Merged revisions 68450,68480-68481,68493,68495,68501,68512,68514-68515,68534-68536,68552,68563,68570-68572,68575,68582,68596,68623-68624,68628 via svnmerge from	2009-01-16 03:54:08 +00:00
asynchat.py	Fixed bugs 760475, 953599, and 1519. This is a translation of changelist 64768	2008-07-07 05:04:12 +00:00
asyncore.py	This fixes bug 5798 on OS X.	2009-06-03 19:48:02 +00:00
base64.py	Make b64encode raises properly a TypeError when altchars is not bytes.	2009-06-29 01:13:41 +00:00
bdb.py	Merged revisions 72322 via svnmerge from	2009-05-05 09:00:19 +00:00
binhex.py	Issues #2715, #6621: Remove unused and undefined references to FSSpec	2009-08-02 20:08:54 +00:00
bisect.py	Per the language summit, the optional fastpath imports should use from-import-star.	2009-03-31 17:51:51 +00:00
build_class.py	…
cProfile.py	Remove the just-removed "help" from __all__.	2009-09-04 17:15:16 +00:00
calendar.py	#3059: Stop decoding Unicode in calendar module.	2008-06-08 08:40:05 +00:00
cgi.py	#4351: more appropriate DeprecationWarning stacklevels	2009-05-08 03:57:12 +00:00
cgitb.py	Merged revisions 70980,71059,71225,71234,71241,71243,71249,71251,71255,71266,71299,71329,71397-71398,71486 via svnmerge from	2009-04-11 19:48:14 +00:00
chunk.py	…
cmd.py	…
code.py	Merged revisions 75264,75268,75293,75318,75391-75392,75436,75478,75971,76003,76058,76140-76141,76231,76380,76428-76429 via svnmerge from	2009-11-25 17:46:26 +00:00
codecs.py	Make TextIOWrapper's seek/tell work properly with stateful decoders;	2008-03-18 04:51:32 +00:00
codeop.py	correct porting error with raise #7161	2009-10-18 00:32:49 +00:00
collections.py	Issue 6370: Performance issue with collections.Counter().	2009-06-29 18:30:43 +00:00
colorsys.py	Merged revisions 68884,68973,68978,69003,69083,69112-69113 via svnmerge from	2009-01-30 03:39:35 +00:00
compileall.py	Merged revisions 71750 via svnmerge from	2009-04-19 17:14:11 +00:00
configparser.py	Merged revisions 71564 via svnmerge from	2009-04-27 16:43:36 +00:00
contextlib.py	remove nested from __all__	2009-07-01 01:38:23 +00:00
copy.py	Merged revisions 76571 via svnmerge from	2009-11-28 15:58:27 +00:00
copyreg.py	Rename copy_reg module to copyreg.	2008-05-11 08:55:36 +00:00
csv.py	Merged revisions 74779-74786,74793,74795,74811,74860-74861,74863,74876,74886,74896,74901,74903,74908,74912,74930,74933,74943,74946,74952-74955,75015,75019,75032,75068,75076,75095,75098,75102,75129,75139,75230 via svnmerge from	2009-10-04 14:49:41 +00:00
decimal.py	Merged revisions 75943-75945 via svnmerge from	2009-10-29 12:23:02 +00:00
difflib.py	Merged revisions 76464 via svnmerge from	2009-11-23 19:02:52 +00:00
dis.py	Merged revisions 68116-68119,68121,68123-68127 via svnmerge from	2009-01-01 15:05:06 +00:00
doctest.py	Merged revisions 76973 via svnmerge from	2009-12-21 12:50:02 +00:00
dummy_threading.py	Rename thread to _thread and dummy_thread to _dummy_thread. Issue #2875.	2008-05-25 13:05:15 +00:00
filecmp.py	Use new form of with-statement instead of contextlib.nested().	2009-06-04 00:11:54 +00:00
fileinput.py	Use PEP 8 and true booleans.	2009-05-17 12:22:57 +00:00
fnmatch.py	Merged revisions 74475 via svnmerge from	2009-08-16 18:58:46 +00:00
formatter.py	Fix formatter usage of filter(). Bug #3800.	2008-09-09 19:31:25 +00:00
fractions.py	Merged revisions 76456 via svnmerge from	2009-11-23 16:27:17 +00:00
ftplib.py	Merged revisions 76546 via svnmerge from	2009-11-27 13:23:26 +00:00
functools.py	…
genericpath.py	Issue #3187: Better support for "undecodable" filenames. Code by Victor	2008-10-02 18:55:37 +00:00
getopt.py	Merged revisions 67463,67572,67576,67628 via svnmerge from	2008-12-07 15:15:22 +00:00
getpass.py	Merged revisions 76000,76016 via svnmerge from	2009-11-01 18:42:17 +00:00
gettext.py	Merged revisions 72506,72525-72526,72551,72558,72616,72654-72655,72689,72745,72750,72802,72812,72822,72824,72826-72827,72833,72876,72890,72923,72946,73026,73042,73045,73047,73065,73068-73069 via svnmerge from	2009-06-01 22:42:33 +00:00
glob.py	Merged revisions 70712,70714,70764-70765,70769-70771,70773,70776-70777,70788-70789,70824,70828,70832,70836,70842,70851,70855,70857,70866-70872,70883,70885,70893-70894,70896-70897,70903,70905-70907,70915,70927,70933,70951,70960,70962-70964,70998,71001,71006,71008,71010-71011,71019,71037,71056,71094,71101-71103,71106,71119,71123,71149-71150,71203,71212,71214-71217,71221,71240 via svnmerge from	2009-04-05 19:13:16 +00:00
gzip.py	Issue #4757: `zlib.compress` and other methods in the zlib module now	2009-12-14 18:00:06 +00:00
hashlib.py	Merged revisions 74479 via svnmerge from	2009-08-16 22:08:56 +00:00
heapq.py	Make life easier for non-CPython implementations	2009-03-29 19:30:50 +00:00
hmac.py	Fixed failing unit tests due to str/bytes mismatch.	2008-03-03 02:59:49 +00:00
imaplib.py	Merged revisions 77041 via svnmerge from	2009-12-24 16:12:49 +00:00
imghdr.py	Merged revisions 65713 via svnmerge from	2008-08-16 16:48:16 +00:00
inspect.py	Merged revisions 75149,75260-75263,75265-75267,75292,75300,75376,75405,75429-75433,75437,75445,75501,75551,75572,75589-75591,75657,75742,75868,75952-75957,76057,76105,76139,76143,76162,76223 via svnmerge from	2009-11-13 02:25:08 +00:00
io.py	add myself	2009-05-01 20:45:43 +00:00
keyword.py	Merged revisions 60151-60159,60161-60168,60170,60172-60173,60175 via svnmerge from	2008-01-21 20:36:10 +00:00
linecache.py	Merged revisions 72319-72320 via svnmerge from	2009-05-05 08:31:54 +00:00
locale.py	Issue #7080: locale.strxfrm() raises a MemoryError on 64-bit non-Windows	2009-10-19 19:43:09 +00:00
macpath.py	Issue3187 for Macintosh platform:	2008-10-03 21:57:20 +00:00
macurl2path.py	Fixing Issue6711 - macurl2path has typos that raise AttributeError	2009-08-16 06:43:50 +00:00
mailbox.py	Merged revisions 75264,75268,75293,75318,75391-75392,75436,75478,75971,76003,76058,76140-76141,76231,76380,76428-76429 via svnmerge from	2009-11-25 17:46:26 +00:00
mailcap.py	…
mimetypes.py	Merged revisions 76306 via svnmerge from	2009-11-15 14:25:16 +00:00
modulefinder.py	no 2.3 compat in the py3k lib #3676	2009-02-16 16:20:10 +00:00
netrc.py	…
nntplib.py	Merged revisions 72640 via svnmerge from	2009-05-14 21:30:46 +00:00
ntpath.py	PendingDeprecationWarning -> DeprecationWarning. Both of these were	2009-06-30 05:33:50 +00:00
nturl2path.py	Fix for issue1153027, making Py3k changes similar to fix in issue918368.	2009-05-05 18:41:13 +00:00
numbers.py	Issue 4998: restore utility of __slots__ on Fraction.	2009-02-12 17:58:36 +00:00
opcode.py	Merged revisions 72912,72920,72940 via svnmerge from	2009-06-28 03:18:59 +00:00
optparse.py	Merged revisions 71540,71563 via svnmerge from	2009-04-27 16:41:41 +00:00
os.py	Issue #7461: objects returned by os.popen() should support the context manager protocol	2009-12-09 00:01:27 +00:00
os2emxpath.py	Remove os.path.walk	2008-05-08 23:44:58 +00:00
pdb.doc	Merged revisions 62998-63003,63005-63006,63009-63012,63014-63017,63019-63020,63022-63024,63026-63029,63031-63041,63043-63045,63047-63054,63056-63062 via svnmerge from	2008-05-16 00:03:33 +00:00
pdb.py	Merged revisions 74838-74839 via svnmerge from	2009-09-16 16:40:45 +00:00
pickle.py	Issue #6137: The pickle module now translates module names when loading	2009-06-04 20:32:06 +00:00
pickletools.py	Issue #6137: The pickle module now translates module names when loading	2009-06-04 20:32:06 +00:00
pipes.py	…
pkgutil.py	Issue 4005: Remove .sort() call on dict_keys object.	2009-07-05 06:42:44 +00:00
platform.py	Merged revisions 74779-74786,74793,74795,74811,74860-74861,74863,74876,74886,74896,74901,74903,74908,74912,74930,74933,74943,74946,74952-74955,75015,75019,75032,75068,75076,75095,75098,75102,75129,75139,75230 via svnmerge from	2009-10-04 14:49:41 +00:00
plistlib.py	updated the doc to match the module docstring, fixed a couple of errors in the doc markup and in the module	2009-09-16 00:49:03 +00:00
poplib.py	Issue #6622: Fix 'variable referenced before assignment' bug in POP3.apop.	2009-08-06 16:06:25 +00:00
posixpath.py	Merged revisions 70980,71059,71225,71234,71241,71243,71249,71251,71255,71266,71299,71329,71397-71398,71486 via svnmerge from	2009-04-11 19:48:14 +00:00
pprint.py	Issue 3976: fix pprint for sets, frozensets, and dicts containing unorderable types.	2009-11-19 01:07:05 +00:00
profile.py	Merged revisions 74773 via svnmerge from	2009-09-13 15:18:53 +00:00
pstats.py	Use true kwonly arg instead of **kwds hackaround.	2009-09-02 20:33:30 +00:00
pty.py	Issue #3782: os.write() must not accept unicode strings	2008-09-15 23:02:56 +00:00
py_compile.py	#2834: Change re module semantics, so that str and bytes mixing is forbidden,	2008-08-19 17:56:33 +00:00
pyclbr.py	Merged revisions 62425-62429,62434-62436,62441,62444,62446-62448,62450-62455,62463,62465-62466,62469,62474,62476-62478,62480,62485,62492,62497-62498,62500,62507,62513-62514,62516,62521,62531,62535,62545-62546,62548-62551,62553-62559,62569,62574,62577,62593,62595,62604-62606,62608,62616,62626-62627,62636,62638,62644-62645,62647-62648,62651-62653,62656,62661,62663,62680,62686-62687,62696,62699-62703,62711 via svnmerge from	2008-05-04 22:42:01 +00:00
pydoc.py	Merged revisions 76312 via svnmerge from	2009-11-15 23:04:33 +00:00
queue.py	port the queue change r70405	2009-03-21 17:36:10 +00:00
quopri.py	Use true booleans and a bit more PEP8.	2009-09-02 20:34:14 +00:00
random.py	Issue #7435: Remove duplicate int/long tests, and other	2009-12-05 20:28:34 +00:00
re.py	Merged revisions 70090 via svnmerge from	2009-03-02 05:21:55 +00:00
reprlib.py	Rename the repr module file to reprlib.py.	2008-05-16 16:05:36 +00:00
rlcompleter.py	Merged revisions 65168 via svnmerge from	2008-07-21 16:32:10 +00:00
runpy.py	Merged revisions 76934-76935 via svnmerge from	2009-12-20 17:28:31 +00:00
sched.py	Merged revisions 72932 via svnmerge from	2009-05-26 07:51:03 +00:00
shelve.py	The default shelve pickle protocol should have been 3.	2009-02-03 04:19:10 +00:00
shlex.py	…
shutil.py	Merged revisions 73250 via svnmerge from	2009-06-05 19:13:27 +00:00
site.py	Merged revisions 74526 via svnmerge from	2009-08-20 21:28:05 +00:00
smtpd.py	Merged revisions 69846 via svnmerge from	2009-02-21 20:59:32 +00:00
smtplib.py	fix print statement	2009-09-25 21:35:24 +00:00
sndhdr.py	…
socket.py	Merged revisions 73138 via svnmerge from	2009-06-02 07:41:26 +00:00
socketserver.py	http://bugs.python.org/issue6382	2009-07-07 09:09:10 +00:00
sre_compile.py	Merged revisions 66894 via svnmerge from	2008-10-14 23:07:40 +00:00
sre_constants.py	#2834: Change re module semantics, so that str and bytes mixing is forbidden,	2008-08-19 17:56:33 +00:00
sre_parse.py	Merged revisions 66894 via svnmerge from	2008-10-14 23:07:40 +00:00
ssl.py	More codestring -> codebytes.	2009-06-04 09:42:55 +00:00
stat.py	Merged revisions 61644,61646-61647,61649-61652,61656-61658,61663,61665,61667 via svnmerge from	2008-03-20 10:49:03 +00:00
string.py	Merged revisions 75070 via svnmerge from	2009-09-26 12:33:22 +00:00
stringprep.py	…
struct.py	Merged revisions 75283 via svnmerge from	2009-10-08 15:59:20 +00:00
subprocess.py	Recorded merge of revisions 77086 via svnmerge from	2009-12-28 08:10:38 +00:00
sunau.py	#3567: fix sunau for running with -bb and make test_ossaudiodev work.	2008-08-17 00:38:32 +00:00
symbol.py	fix an ambiguity in the grammar from the implementation of extended unpacking	2009-09-27 02:43:28 +00:00
symtable.py	simplify this expression	2009-06-28 19:30:36 +00:00
tabnanny.py	…
tarfile.py	Issue #4757: `zlib.compress` and other methods in the zlib module now	2009-12-14 18:00:06 +00:00
telnetlib.py	- fix issue #6106, Telnet.process_rawq default handling of WILL/WONT/DO/DONT	2009-07-26 22:23:04 +00:00
tempfile.py	#6077: on Windows, fix truncation of a tempfile.TemporaryFile opened in "wt+" mode:	2009-11-30 00:08:56 +00:00
textwrap.py	Merged revisions 74779-74786,74793,74795,74811,74860-74861,74863,74876,74886,74896,74901,74903,74908,74912,74930,74933,74943,74946,74952-74955,75015,75019,75032,75068,75076,75095,75098,75102,75129,75139,75230 via svnmerge from	2009-10-04 14:49:41 +00:00
this.py	…
threading.py	Issue #3001: Add a C implementation of recursive locks which is used by	2009-11-10 18:46:01 +00:00
timeit.py	Localize the function lookup in timeit.	2009-04-03 02:45:36 +00:00
token.py	Merged revisions 61038,61042-61045,61047,61050,61053,61055-61056,61061-61064,61066-61080 via svnmerge from	2008-02-26 08:18:30 +00:00
tokenize.py	use some more itertools magic to make '' be yielded after readline is done	2009-11-14 18:09:17 +00:00
trace.py	#5656: detect correct encoding of files when reporting coverage in trace.py, and ignore files in the temporary directory when reporting.	2009-04-01 23:07:29 +00:00
traceback.py	Issue #4486: When an exception has an explicit cause, do not print its implicit context too.	2009-11-28 16:12:28 +00:00
tty.py	…
turtle.py	#7129: add missing function.	2009-10-14 18:46:15 +00:00
types.py	Merged revisions 62194,62197-62198,62204-62205,62214,62219-62221,62227,62229-62231,62233-62235,62237-62239 via svnmerge from	2008-04-09 08:37:03 +00:00
uu.py	Use true booleans and PEP8 for argdefaults.	2009-09-16 15:54:04 +00:00
uuid.py	#7380: Fix some str/bytearray/bytes issues in uuid docs and implementation.	2009-12-19 18:23:28 +00:00
warnings.py	Merged revisions 75365,75394,75402-75403,75418,75459,75484,75592-75596,75600,75602-75607,75610-75613,75616-75617,75623,75627,75640,75647,75696,75795 via svnmerge from	2009-10-27 15:28:25 +00:00
wave.py	…
weakref.py	Issue #6149: Fix initialization of WeakValueDictionary objects from non-empty parameters.	2009-05-30 21:04:26 +00:00
webbrowser.py	Merged revisions 74277,74321,74323,74326,74355,74465,74467,74488,74492,74513,74531,74549,74553,74625,74632,74643-74644,74647,74652,74666,74671,74727,74739 via svnmerge from	2009-09-11 22:24:02 +00:00
wsgiref.egg-info	…
xdrlib.py	…
zipfile.py	fix print statement	2009-09-25 21:35:24 +00:00