Guido van Rossum 079381d236 Merge issue 11662 from 2.5.		2011-03-29 12:51:16 -07:00
..
bsddb	Merged revisions 75407,75409-75413,75415,75419-75421 via svnmerge from	2010-08-03 03:19:00 +00:00
compiler	Merged revisions 77310-77311 via svnmerge from	2010-08-02 00:24:26 +00:00
ctypes	Merged revisions 78757 via svnmerge from	2010-08-02 21:35:06 +00:00
curses	Merged revisions 83593 via svnmerge from	2010-08-02 21:45:43 +00:00
distutils	2.6.6 final. \o/	2010-08-23 23:37:56 +00:00
email	Merged revisions 77942,79023 via svnmerge from	2010-08-02 18:40:55 +00:00
encodings	Merged revisions 83198 via svnmerge from	2010-07-28 01:55:43 +00:00
hotshot	Fix deprecation warnings in test_hotshot.py	2010-08-03 07:03:40 +00:00
idlelib	2.6.6 final. \o/	2010-08-23 23:37:56 +00:00
json	Merged revisions 66801,66803-66804,66813,66854-66856,66866,66870-66872,66874,66887,66903,66905,66911,66913,66927,66932,66938,66942,66962,66964,66973-66974,66977,66992,66998-66999,67002,67005,67007,67028,67040-67041,67044,67070,67089,67091,67101,67117-67119,67123-67124 via svnmerge from	2008-11-07 08:56:27 +00:00
lib-tk	Merged revisions 81701 via svnmerge from	2010-06-04 19:46:21 +00:00
lib2to3	Merged revisions 81479 via svnmerge from	2010-05-22 18:59:38 +00:00
logging	Reverted bug fixes for #11444 (fc4d045e3170) and #11424 (b9d76846bb1c), which should not have been made in this branch.	2011-03-11 18:44:10 +00:00
msilib	Merged revisions 73390 via svnmerge from	2009-06-13 09:07:01 +00:00
multiprocessing	Fix #9600. Don't use relative imports for _multiprocessing on Windows.	2010-08-14 17:09:55 +00:00
plat-aix3	…
plat-aix4	…
plat-atheos	…
plat-beos5	…
plat-darwin	…
plat-freebsd4	…
plat-freebsd5	…
plat-freebsd6	…
plat-freebsd7	…
plat-freebsd8	…
plat-generic	…
plat-irix5	Deprecate WAIT for removal in 3.0.	2008-05-15 04:17:35 +00:00
plat-irix6	Merged revisions 77593,77702-77703,77858,77887,78113-78115,78117,78245,78385-78386,78496,78760,78771-78773,78802 via svnmerge from	2010-03-21 19:29:04 +00:00
plat-linux2	…
plat-mac	Merged revisions 78035,78040,78043,78049-78050,78052-78054 via svnmerge from	2010-02-07 12:01:19 +00:00
plat-netbsd1	…
plat-next3	…
plat-os2emx	#2503 make singletons compared with "is" not == or !=	2008-03-29 15:24:25 +00:00
plat-riscos	Patch #2167 from calvin: Remove unused imports	2008-02-23 17:40:11 +00:00
plat-sunos5	Deprecate sunaudiodev/SUNAUDIODEV for removal in 3.0.	2008-05-16 00:10:24 +00:00
plat-unixware7	…
site-packages	…
sqlite3	Merged revisions 77942,79023 via svnmerge from	2010-08-02 18:40:55 +00:00
test	Merge issue 11662 from 2.5.	2011-03-29 12:51:16 -07:00
wsgiref	Apply the change suggested by PJE for issue 7250. Unfortunately, we couldn't	2010-03-01 21:34:34 +00:00
xml	Issue 2235: Py3k warnings are now emitted for classes that will no longer inherit a__hash__ implementation from a parent class in Python 3.x. The standard library and test suite have been updated to not emit these warnings.	2008-08-11 15:45:58 +00:00
BaseHTTPServer.py	Merged revisions 78299 via svnmerge from	2010-02-22 10:57:29 +00:00
Bastion.py	Deprecate Bastion and rexec for 3.0.	2008-05-10 02:27:04 +00:00
CGIHTTPServer.py	Merged revisions 76212 via svnmerge from	2009-11-11 17:24:53 +00:00
ConfigParser.py	Merged revisions 83452,83457,83466,83471,83475,83480,83486 via svnmerge from	2010-08-01 21:48:47 +00:00
Cookie.py	Merged revisions 83421,83424 via svnmerge from	2010-08-01 22:13:33 +00:00
DocXMLRPCServer.py	Remove a dict.has_key() use in DocXMLRPCServer that comes up under -3.	2008-08-03 22:59:46 +00:00
HTMLParser.py	Merged revisions 81500-81501 via svnmerge from	2010-05-24 21:42:59 +00:00
MimeWriter.py	…
Queue.py	give the threading API PEP 8 names	2008-06-11 17:27:50 +00:00
SimpleHTTPServer.py	merge from 2.5 branch.	2011-03-17 14:23:24 +08:00
SimpleXMLRPCServer.py	Merged revisions 71268 via svnmerge from	2009-04-05 21:34:15 +00:00
SocketServer.py	Merged revisions 80484 via svnmerge from	2010-04-25 21:55:45 +00:00
StringIO.py	Merged revisions 75407,75409-75413,75415,75419-75421 via svnmerge from	2010-08-03 03:19:00 +00:00
UserDict.py	revert r77790. it requires a new-style class change	2010-01-28 01:31:13 +00:00
UserList.py	Issue 2235: Py3k warnings are now emitted for classes that will no longer inherit a__hash__ implementation from a parent class in Python 3.x. The standard library and test suite have been updated to not emit these warnings.	2008-08-11 15:45:58 +00:00
UserString.py	Issue 2235: __hash__ is once again inherited by default, but inheritance can be blocked explicitly so that collections.Hashable remains meaningful	2008-07-15 14:27:37 +00:00
_LWPCookieJar.py	…
_MozillaCookieJar.py	Merged revisions 83392,83426 via svnmerge from	2010-08-01 22:05:31 +00:00
__future__.py	Patch #2477: Added from __future__ import unicode_literals	2008-03-26 22:01:37 +00:00
__phello__.foo.py	…
_abcoll.py	Merged revisions 81414 via svnmerge from	2010-05-21 21:03:02 +00:00
_strptime.py	add %f format to datetime - issue 1158	2008-03-15 16:04:45 +00:00
_threading_local.py	Merged revisions 76117 via svnmerge from	2009-11-05 13:44:28 +00:00
abc.py	Merged revisions 78800 via svnmerge from	2010-03-23 12:37:29 +00:00
aifc.py	Merged revisions 75407,75409-75413,75415,75419-75421 via svnmerge from	2010-08-03 03:19:00 +00:00
anydbm.py	…
ast.py	Merged revisions 66984 via svnmerge from	2008-10-20 21:43:57 +00:00
asynchat.py	warnings.catch_warnings() now returns a list or None instead of the custom	2008-09-09 00:49:16 +00:00
asyncore.py	(issue 2944) reverting r83704 changes as per Barry Warsaw request	2010-08-13 01:30:39 +00:00
atexit.py	…
audiodev.py	Deprecate the audiodev module for 3.0.	2008-05-06 23:23:34 +00:00
base64.py	…
bdb.py	Merged revisions 83429,83436 via svnmerge from	2010-08-01 22:10:15 +00:00
binhex.py	Merged revisions 77310-77311 via svnmerge from	2010-08-02 00:24:26 +00:00
bisect.py	Issue 3301: Bisect functions behaved badly when lo was negative.	2008-07-10 14:03:19 +00:00
cProfile.py	…
calendar.py	Merged revisions 78757 via svnmerge from	2010-08-02 21:35:06 +00:00
cgi.py	Merged revisions 77871,77910,77913 via svnmerge from	2010-08-02 03:14:27 +00:00
cgitb.py	Merged revisions 79558 via svnmerge from	2010-08-02 20:26:41 +00:00
chunk.py	…
cmd.py	Merged revisions 83381 via svnmerge from	2010-08-01 04:11:05 +00:00
code.py	#1288615: Python code.interact() and non-ASCII input	2008-08-07 18:42:40 +00:00
codecs.py	Merged revisions 81471-81472 via svnmerge from	2010-05-22 16:52:13 +00:00
codeop.py	…
collections.py	Fix field name conflicts for named tuples.	2009-05-27 02:17:26 +00:00
colorsys.py	…
commands.py	Merged revisions 72458 via svnmerge from	2009-05-08 02:47:02 +00:00
compileall.py	fix typo	2008-03-04 21:14:04 +00:00
contextlib.py	#1748: use functools.wraps instead of rolling own metadata update.	2008-04-30 21:08:42 +00:00
cookielib.py	Merged revisions 83145 via svnmerge from	2010-07-25 20:00:02 +00:00
copy.py	Revert the renaming of repr to reprlib.	2008-05-23 05:03:59 +00:00
copy_reg.py	Revert copy_reg -> copyreg rename.	2008-05-20 07:49:57 +00:00
csv.py	Update __all__ for cookielib, csv, os, and urllib2 for objects imported into	2008-08-18 00:46:22 +00:00
dbhash.py	Merged revisions 77310-77311 via svnmerge from	2010-08-02 00:24:26 +00:00
decimal.py	Issue #9136: Fix 'dictionary changed size during iteration'	2010-07-08 21:27:05 +00:00
difflib.py	Merged revisions 76464 via svnmerge from	2009-11-23 18:54:33 +00:00
dircache.py	Deprecate the dircache module for 3.0.	2008-05-10 21:12:57 +00:00
dis.py	Merged revisions 79769 via svnmerge from	2010-04-04 23:27:35 +00:00
doctest.py	Merged revisions 83429,83436 via svnmerge from	2010-08-01 22:10:15 +00:00
dumbdbm.py	…
dummy_thread.py	Remove imports of 'warnings' that are no longer needed in dummy_thread,	2008-08-17 22:10:11 +00:00
dummy_threading.py	…
filecmp.py	Remove imports of 'warnings' that are no longer needed in dummy_thread,	2008-08-17 22:10:11 +00:00
fileinput.py	Remove a use of callable() in fileinput to silence a -3 warning.	2008-08-03 23:52:32 +00:00
fnmatch.py	Merged revisions 82769 via svnmerge from	2010-07-10 14:11:51 +00:00
formatter.py	Merged revisions 77310-77311 via svnmerge from	2010-08-02 00:24:26 +00:00
fpformat.py	Deprecate the fpformat module for removal in 3.0.	2008-05-10 22:11:45 +00:00
fractions.py	Merged revisions 76456 via svnmerge from	2009-11-23 16:25:51 +00:00
ftplib.py	Merged revisions 80226 via svnmerge from	2010-04-19 21:56:45 +00:00
functools.py	Copy reduce() to _functools so to have functools.reduce() not raise a warning	2008-08-09 23:30:55 +00:00
genericpath.py	…
getopt.py	Merged revisions 83117 via svnmerge from	2010-07-24 01:12:54 +00:00
getpass.py	Merged revisions 76000 via svnmerge from	2009-11-01 18:31:13 +00:00
gettext.py	…
glob.py	Merged revisions 70866-70868,70870-70871,70893,70896,70902,70905,70907,70912,70915,70927,70933,70940,70944,70954,70963,70998,71056 via svnmerge from	2009-04-05 21:21:05 +00:00
gzip.py	Merged revisions 80762 via svnmerge from	2010-05-04 18:46:24 +00:00
hashlib.py	backport r66093 from trunk.	2008-08-31 16:36:21 +00:00
heapq.py	Merged revisions 68750,68811,68945,69157 via svnmerge from	2010-05-18 23:37:50 +00:00
hmac.py	silence callable warning in hmac	2008-08-19 19:07:38 +00:00
htmlentitydefs.py	revert creation of the html.entities and html.parser modules	2008-05-20 06:08:38 +00:00
htmllib.py	Deprecate htmllib and sgmllib for 3.0.	2008-06-01 21:19:14 +00:00
httplib.py	Merged revisions 75407,75409-75413,75415,75419-75421 via svnmerge from	2010-08-03 03:19:00 +00:00
ihooks.py	Deprecate ihooks for removal in 3.0.	2008-05-10 22:45:07 +00:00
imaplib.py	Merged revisions 83392,83426 via svnmerge from	2010-08-01 22:05:31 +00:00
imghdr.py	#3424 rearrange the order of tests in imghdr to place more common types first	2008-08-16 16:29:02 +00:00
imputil.py	Merged revisions 77310-77311 via svnmerge from	2010-08-02 00:24:26 +00:00
inspect.py	Merged revisions 74285 via svnmerge from	2009-08-02 15:41:08 +00:00
io.py	Merged revisions 78757 via svnmerge from	2010-08-02 21:35:06 +00:00
keyword.py	#1726198: replace while 1: fp.readline() with file iteration.	2008-01-21 17:22:06 +00:00
linecache.py	Merged revisions 81432 via svnmerge from	2010-05-21 21:45:16 +00:00
locale.py	Merged revisions 72399 via svnmerge from	2009-05-06 13:21:17 +00:00
macpath.py	Merged revisions 79195,79425,79427,79450 via svnmerge from	2010-03-28 09:37:55 +00:00
macurl2path.py	…
mailbox.py	Merged revisions 77310-77311 via svnmerge from	2010-08-02 00:24:26 +00:00
mailcap.py	…
markupbase.py	…
md5.py	…
mhlib.py	Deprecated the mhlib module for removal in 3.0.	2008-05-11 03:01:47 +00:00
mimetools.py	warnings.catch_warnings() now returns a list or None instead of the custom	2008-09-09 00:49:16 +00:00
mimetypes.py	Merged revisions 72045 via svnmerge from	2009-04-27 21:01:13 +00:00
mimify.py	…
modulefinder.py	Merged revisions 67046 via svnmerge from	2008-10-30 20:29:54 +00:00
multifile.py	Deprecate the multifile module as per PEP 4.	2008-05-12 03:19:20 +00:00
mutex.py	The mutex module has been deprecated for removal in 3.0.	2008-05-08 19:26:08 +00:00
netrc.py	…
new.py	Deprecate the new module for removal in 3.0.	2008-05-09 05:18:40 +00:00
nntplib.py	Merged revisions 72640 via svnmerge from	2009-05-14 21:27:08 +00:00
ntpath.py	Merged revisions 83429,83436 via svnmerge from	2010-08-01 22:10:15 +00:00
nturl2path.py	merge r72343. Fix for issue7043	2009-10-05 04:13:01 +00:00
numbers.py	Merged revisions 68813,69546 via svnmerge from	2009-02-12 18:05:07 +00:00
opcode.py	…
optparse.py	Merged revisions 69846 via svnmerge from	2009-07-02 15:37:21 +00:00
os.py	Merged revisions 77879 via svnmerge from	2010-01-31 16:47:55 +00:00
os2emxpath.py	Merged revisions 78247 via svnmerge from	2010-02-20 09:16:04 +00:00
pdb.doc	Add some sentence endings.	2008-05-11 14:17:13 +00:00
pdb.py	Merged revisions 83429,83436 via svnmerge from	2010-08-01 22:10:15 +00:00
pickle.py	Remove use of callable() from pickle to silence warnings under -3.	2008-08-04 21:34:34 +00:00
pickletools.py	Merged revisions 72792 via svnmerge from	2009-05-20 19:05:16 +00:00
pipes.py	Merged revisions 79822,79828,79862,80067,80069,80080-80081,80084,80432-80433 via svnmerge from	2010-05-18 23:19:34 +00:00
pkgutil.py	Issue 2439: add pkgutils.get_data() as a convenience wrapper for the PEP 302 get_data() API (contributed by Paul Moore)	2008-04-15 10:25:31 +00:00
platform.py	Merged revisions 83646 via svnmerge from	2010-08-03 08:09:15 +00:00
plistlib.py	Merged revisions 72458 via svnmerge from	2009-05-08 02:47:02 +00:00
popen2.py	Use os.closerange() in popen2.	2008-02-23 22:09:24 +00:00
poplib.py	Fixed the semantic of timeout for socket.create_connection and	2008-05-29 16:39:26 +00:00
posixfile.py	…
posixpath.py	Merged revisions 83421,83424 via svnmerge from	2010-08-01 22:13:33 +00:00
pprint.py	Merged revisions 77310-77311 via svnmerge from	2010-08-02 00:24:26 +00:00
profile.py	Merged revisions 74773 via svnmerge from	2009-09-13 15:12:47 +00:00
pstats.py	Merged revisions 83533 via svnmerge from	2010-08-02 17:40:28 +00:00
pty.py	…
py_compile.py	#2225: return nonzero status code from py_compile if not all files could be compiled.	2008-03-06 07:41:16 +00:00
pyclbr.py	Minor cleanups:	2008-04-28 02:57:23 +00:00
pydoc.py	Merged revisions 83392,83426 via svnmerge from	2010-08-01 22:05:31 +00:00
pydoc_topics.py	2.6.6 final. \o/	2010-08-23 23:37:56 +00:00
quopri.py	…
random.py	Issue 6261: Clarify behavior of random.uniform().	2009-06-11 23:18:54 +00:00
re.py	Merged revisions 67952-67953,67955,67957-67958,67960-67961,67963,67965,67967,67970-67971,67973,67982,67988,67990,67995,68014,68016,68030,68057,68061,68112,68115-68118,68120-68121,68123-68128 via svnmerge from	2009-01-01 15:46:10 +00:00
repr.py	Revert the renaming of repr to reprlib.	2008-05-23 05:03:59 +00:00
rexec.py	Deprecate Bastion and rexec for 3.0.	2008-05-10 02:27:04 +00:00
rfc822.py	fix test_py3kwarns	2008-07-14 17:42:17 +00:00
rlcompleter.py	Remove a use of callable() to silence the warning triggered under -3.	2008-08-01 01:45:49 +00:00
robotparser.py	Merged revisions 83449 via svnmerge from	2010-08-01 22:00:39 +00:00
runpy.py	Merged revisions 67750-67751 via svnmerge from	2008-12-14 11:30:16 +00:00
sched.py	Merged revisions 72932 via svnmerge from	2009-05-26 07:50:52 +00:00
sets.py	Merged revisions 77310-77311 via svnmerge from	2010-08-02 00:24:26 +00:00
sgmllib.py	Merged revisions 70906 via svnmerge from	2009-04-04 12:51:52 +00:00
sha.py	…
shelve.py	Merged revisions 78141-78142 via svnmerge from	2010-02-11 02:01:02 +00:00
shlex.py	…
shutil.py	Merged revisions 80830 via svnmerge from	2010-05-05 22:21:13 +00:00
site.py	Partial backport of r78826: leave import site error handler unchanged (print	2010-03-21 14:02:32 +00:00
smtpd.py	backporting security fix of issue 9129 (smtpd module vulnerable to DoS attacks in case of connection bashing)	2010-12-07 18:54:43 +00:00
smtplib.py	Merged revisions 72835 via svnmerge from	2009-05-23 01:42:42 +00:00
sndhdr.py	Merged revisions 75407,75409-75413,75415,75419-75421 via svnmerge from	2010-08-03 03:19:00 +00:00
socket.py	#9543: Fix regression introduced in r83624.	2010-08-12 17:29:24 +00:00
sre.py	…
sre_compile.py	Issue2564: Prevent a hang in "import test.autotest", which runs the entire test	2008-04-08 21:27:42 +00:00
sre_constants.py	…
sre_parse.py	remove some __getslice__	2008-05-27 01:18:39 +00:00
ssl.py	Merged revisions 80557 via svnmerge from	2010-04-27 22:05:18 +00:00
stat.py	#2383: remove obsolete XXX comment in stat.py.	2008-03-20 07:25:55 +00:00
statvfs.py	Deprecated statvfs for removal in 3.0.	2008-05-16 00:50:02 +00:00
string.py	Merged revisions 75070 via svnmerge from	2009-09-26 11:23:16 +00:00
stringold.py	Replace all map(None, a) with list(a).	2008-07-18 19:06:13 +00:00
stringprep.py	…
struct.py	Merged revisions 75283 via svnmerge from	2009-10-27 17:00:03 +00:00
subprocess.py	Merged revisions 82973 via svnmerge from	2010-07-19 14:49:38 +00:00
sunau.py	Merged revisions 77310-77311 via svnmerge from	2010-08-02 00:24:26 +00:00
sunaudio.py	Deprecate the sunaudio module for removal in Python 3.0. The sunau module can provide similar functionality.	2008-07-18 19:30:22 +00:00
symbol.py	Patch #1759: Backport of PEP 3129 class decorators	2008-02-23 15:01:05 +00:00
symtable.py	Merged revisions 70801,70809 via svnmerge from	2009-03-31 14:30:05 +00:00
tabnanny.py	…
tarfile.py	Merged revisions 81663 via svnmerge from	2010-06-03 10:07:08 +00:00
telnetlib.py	Fixed the semantic of timeout for socket.create_connection and	2008-05-29 16:39:26 +00:00
tempfile.py	Remove references to platform 'mac'	2008-05-12 11:24:33 +00:00
textwrap.py	Merged revisions 67952-67953,67955,67957-67958,67960-67961,67963,67965,67967,67970-67971,67973,67982,67988,67990,67995,68014,68016,68030,68057,68061,68112,68115-68118,68120-68121,68123-68128 via svnmerge from	2009-01-01 15:46:10 +00:00
this.py	…
threading.py	Merged revisions 78517 via svnmerge from	2010-02-28 18:40:12 +00:00
timeit.py	Merged revisions 83421,83424 via svnmerge from	2010-08-01 22:13:33 +00:00
toaiff.py	Deprecate the toaiff module for removal in 3.0.	2008-05-09 05:32:42 +00:00
token.py	Issue 2117. Update compiler module to handle class decorators.	2008-02-25 18:06:00 +00:00
tokenize.py	Remove a tuple unpacking in a parameter list to remove a SyntaxWarning raised	2008-08-02 03:15:20 +00:00
trace.py	Merged revisions 83421,83424 via svnmerge from	2010-08-01 22:13:33 +00:00
traceback.py	Merged revisions 80777 via svnmerge from	2010-05-05 12:45:31 +00:00
tty.py	…
types.py	Issue 2408: remove the _types module	2008-04-08 22:07:05 +00:00
unittest.py	Move initialising unittest.TestProgram.testRunner into runTests. Issue 6418.	2009-07-13 16:32:47 +00:00
urllib.py	Merge issue 11662 from 2.5.	2011-03-29 12:51:16 -07:00
urllib2.py	Merge issue 11662 from 2.5.	2011-03-29 12:51:16 -07:00
urlparse.py	Merged revisions 82883 via svnmerge from	2010-07-14 10:58:12 +00:00
user.py	Deprecate the user module for removal in 3.0.	2008-05-08 20:36:09 +00:00
uu.py	…
uuid.py	Merged revisions 75407,75409-75413,75415,75419-75421 via svnmerge from	2010-08-03 03:19:00 +00:00
warnings.py	Merged revisions 78757 via svnmerge from	2010-08-02 21:35:06 +00:00
wave.py	Merged revisions 77310-77311 via svnmerge from	2010-08-02 00:24:26 +00:00
weakref.py	Update __all__ for cookielib, csv, os, and urllib2 for objects imported into	2008-08-18 00:46:22 +00:00
webbrowser.py	Merged revisions 77310-77311 via svnmerge from	2010-08-02 00:24:26 +00:00
whichdb.py	…
wsgiref.egg-info	…
xdrlib.py	…
xmllib.py	Merged revisions 72458 via svnmerge from	2009-05-08 02:47:02 +00:00
xmlrpclib.py	Remove assignment to True/False and use of dict.has_key() to silence warnings	2008-08-04 00:50:11 +00:00
zipfile.py	Merged revisions 74245 via svnmerge from	2010-01-06 20:08:02 +00:00