Benjamin Peterson 699adb9cd8 Merged revisions 62873,62887,62892-62896,62904 via svnmerge from ... svn+ssh://pythondev@svn.python.org/python/trunk ........ r62873 | raymond.hettinger | 2008-05-08 12:18:13 -0500 (Thu, 08 May 2008) | 1 line Issue 2778. Document the temporary frozenset swap in __contains__(), remove(), and discard(). ........ r62887 | brett.cannon | 2008-05-08 14:50:51 -0500 (Thu, 08 May 2008) | 5 lines Make test.test_support.catch_warning() take an argument specifying if any triggered warnings should be captured. This allows the context manager to be used to just prevent the internal state of the 'warnings' framework and thus allow triggered warnings to be displayed. ........ r62892 | brett.cannon | 2008-05-08 15:20:24 -0500 (Thu, 08 May 2008) | 4 lines Fix a bug introduced by the addition of the 'record' argument to test.test_support.catch_warning() where showwarning() was not being set properly. ........ r62893 | brett.cannon | 2008-05-08 15:20:54 -0500 (Thu, 08 May 2008) | 2 lines Document the 'record' argument for test.test_support.catch_warning(). ........ r62894 | brett.cannon | 2008-05-08 15:23:06 -0500 (Thu, 08 May 2008) | 4 lines Fix sys.flags to properly expose bytes_warning. Closes issue #2790. ........ r62895 | brett.cannon | 2008-05-08 15:23:54 -0500 (Thu, 08 May 2008) | 2 lines Add a missing entry on the fix for issue #2790. ........ r62896 | brett.cannon | 2008-05-08 15:24:43 -0500 (Thu, 08 May 2008) | 2 lines Add test.test_support.catch_warning()'s new argument. ........ r62904 | benjamin.peterson | 2008-05-08 17:09:54 -0500 (Thu, 08 May 2008) | 2 lines Replace instances of os.path.walk with os.walk ........		2008-05-08 22:27:58 +00:00
..
bsddb	Merged revisions 62021,62029,62035-62038,62043-62044,62052-62053 via svnmerge from	2008-03-31 01:51:45 +00:00
ctypes	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
curses	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
distutils	Merged revisions 62873,62887,62892-62896,62904 via svnmerge from	2008-05-08 22:27:58 +00:00
email	Removed implicit convertions of str object to bytes from base64.	2008-05-03 04:39:38 +00:00
encodings	The bz2 codec isn't supported any more. I've also commented out several codecs which were removed in the past.	2007-12-02 15:27:38 +00:00
idlelib	Bumping versions for 3.0a5	2008-05-08 11:54:13 +00:00
json	Merged revisions 62805,62811,62841-62842,62848-62849,62853-62854 via svnmerge from	2008-05-08 17:18:53 +00:00
lib-tk	Merged revisions 62021,62029,62035-62038,62043-62044,62052-62053 via svnmerge from	2008-03-31 01:51:45 +00:00
lib2to3	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
logging	Merged revisions 62090-62091,62096,62100,62102,62110-62114 via svnmerge from	2008-04-02 21:49:44 +00:00
msilib	long integer -> integer.	2007-11-29 18:48:53 +00:00
plat-aix4
plat-atheos
plat-darwin
plat-freebsd4
plat-freebsd5
plat-freebsd6	Merged revisions 58221-58741 via svnmerge from	2007-11-01 19:42:39 +00:00
plat-freebsd7	Merged revisions 58221-58741 via svnmerge from	2007-11-01 19:42:39 +00:00
plat-freebsd8	Merged revisions 58221-58741 via svnmerge from	2007-11-01 19:42:39 +00:00
plat-generic
plat-linux2
plat-mac	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
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
site-packages
sqlite3	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
test	Merged revisions 62873,62887,62892-62896,62904 via svnmerge from	2008-05-08 22:27:58 +00:00
wsgiref	Issue #1066: implement PEP 3109, 2/3 of PEP 3134.	2007-08-31 00:04:24 +00:00
xml	Merged revisions 62021,62029,62035-62038,62043-62044,62052-62053 via svnmerge from	2008-03-31 01:51:45 +00:00
__future__.py	Merged revisions 61952-61953 via svnmerge from	2008-03-26 22:34:47 +00:00
__phello__.foo.py
_abcoll.py	Merged revisions 61209-61214,61217-61222,61224-61226,61233-61237 via svnmerge from	2008-03-04 23:39:23 +00:00
_LWPCookieJar.py
_markupbase.py	rename markupbase to _markupbase	2007-12-07 11:10:11 +00:00
_MozillaCookieJar.py
_strptime.py	Merged revisions 61239-61249,61252-61257,61260-61264,61269-61275,61278-61279,61285-61286,61288-61290,61298,61303-61305,61312-61314,61317,61329,61332,61344,61350-61351,61363-61376,61378-61379,61382-61383,61387-61388,61392,61395-61396,61402-61403 via svnmerge from	2008-03-16 00:07:10 +00:00
_threading_local.py
_weakrefset.py	Moved WeakSet into a bootstap module use by abc.py.	2008-02-05 00:20:01 +00:00
abc.py	Merged revisions 61038,61042-61045,61047,61050,61053,61055-61056,61061-61062,61066,61068,61070,61083,61085,61092-61103 via svnmerge from	2008-02-28 12:27:11 +00:00
aifc.py	#1535: rename __builtin__ module to builtins.	2007-12-02 09:40:06 +00:00
anydbm.py	Raise statement normalization in Lib/.	2007-08-30 01:19:48 +00:00
asynchat.py	Fix test_smtplib by munging asynchat some more.	2007-08-31 00:20:14 +00:00
asyncore.py	Fix exception slicing.	2008-01-06 18:23:30 +00:00
base64.py	Removed implicit convertions of str object to bytes from base64.	2008-05-03 04:39:38 +00:00
BaseHTTPServer.py	Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552,60554,60556-60559,60561-60562,60569,60571-60572,60574,60576-60583,60585-60586,60589,60591,60594-60595,60597-60598,60600-60601,60606-60612,60615,60617,60619-60621,60623-60625,60627-60629,60631,60633,60635,60647,60650,60652,60654,60656,60658-60659,60664-60666,60668-60670,60672,60676,60678,60680-60683,60685-60686,60688,60690,60692-60694,60697-60700,60705-60706,60708,60711,60714,60720,60724-60730,60732,60736,60742,60744,60746,60748,60750-60751,60753,60756-60757,60759-60761,60763-60764,60766,60769-60770,60774-60784,60787-60789,60793,60796,60799-60809,60812-60813,60815-60821,60823-60826,60828-60829,60831-60834,60836,60838-60839,60846-60849,60852-60854,60856-60859,60861-60870,60874-60875,60880-60881,60886,60888-60890,60892,60894-60898,60900,60902-60906,60908,60911-60917,60919-60920,60922,60926,60929-60931,60933-60935,60937,60939-60941,60943-60954,60959-60961,60963-60964,60966-60967,60971,60977,60979-60989 via svnmerge from	2008-02-23 16:23:06 +00:00
bdb.py	Merged revisions 62018 via svnmerge from	2008-03-30 20:43:50 +00:00
binhex.py	Patch# 1258 by Christian Heimes: kill basestring.	2007-10-16 18:12:55 +00:00
bisect.py
build_class.py
calendar.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
cgi.py	Remove one use of UserDict.UserDict	2008-02-04 22:43:27 +00:00
CGIHTTPServer.py
cgitb.py
chunk.py	Raise statement normalization in Lib/.	2007-08-30 01:19:48 +00:00
cmd.py	Patch# 1258 by Christian Heimes: kill basestring.	2007-10-16 18:12:55 +00:00
code.py	Fix issue #1707. When raw_input() was removed, it was incorrectly replaced	2008-01-02 02:55:27 +00:00
codecs.py	Make TextIOWrapper's seek/tell work properly with stateful decoders;	2008-03-18 04:51:32 +00:00
codeop.py	Raise statement normalization in Lib/.	2007-08-30 01:19:48 +00:00
collections.py	Move UserString to collections.	2008-02-21 22:11:37 +00:00
colorsys.py
commands.py
compileall.py	Merged revisions 61209-61214,61217-61222,61224-61226,61233-61237 via svnmerge from	2008-03-04 23:39:23 +00:00
ConfigParser.py	Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552,60554,60556-60559,60561-60562,60569,60571-60572,60574,60576-60583,60585-60586,60589,60591,60594-60595,60597-60598,60600-60601,60606-60612,60615,60617,60619-60621,60623-60625,60627-60629,60631,60633,60635,60647,60650,60652,60654,60656,60658-60659,60664-60666,60668-60670,60672,60676,60678,60680-60683,60685-60686,60688,60690,60692-60694,60697-60700,60705-60706,60708,60711,60714,60720,60724-60730,60732,60736,60742,60744,60746,60748,60750-60751,60753,60756-60757,60759-60761,60763-60764,60766,60769-60770,60774-60784,60787-60789,60793,60796,60799-60809,60812-60813,60815-60821,60823-60826,60828-60829,60831-60834,60836,60838-60839,60846-60849,60852-60854,60856-60859,60861-60870,60874-60875,60880-60881,60886,60888-60890,60892,60894-60898,60900,60902-60906,60908,60911-60917,60919-60920,60922,60926,60929-60931,60933-60935,60937,60939-60941,60943-60954,60959-60961,60963-60969,60971-60976 via svnmerge from	2008-02-23 13:18:03 +00:00
contextlib.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
Cookie.py
cookielib.py	Issue #1771: Remove cmp parameter from list.sort() and builtin.sorted().	2008-01-30 20:15:17 +00:00
copy.py	Merged revisions 61834,61841-61842,61851-61853,61863-61864,61869-61870,61874,61889 via svnmerge from	2008-03-25 14:56:36 +00:00
copy_reg.py	Patch# 1258 by Christian Heimes: kill basestring.	2007-10-16 18:12:55 +00:00
cProfile.py	Patch# 1258 by Christian Heimes: kill basestring.	2007-10-16 18:12:55 +00:00
csv.py	Obvious simplification, now that "long" has disappeared.	2008-04-24 18:26:53 +00:00
dbhash.py
decimal.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
difflib.py	Merged revisions 59883-59920 via svnmerge from	2008-01-11 16:17:00 +00:00
dircache.py
dis.py	Removed the API to create unbound methods and simplified the API for bound methods. The signature is PyMethod_New(func, instance).	2007-11-27 10:40:20 +00:00
doctest.py	Merged revisions 59883-59920 via svnmerge from	2008-01-11 16:17:00 +00:00
DocXMLRPCServer.py	Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552,60554,60556-60559,60561-60562,60568-60598,60600-60616 via svnmerge from	2008-02-06 14:31:34 +00:00
dumbdbm.py	Start replacing UserDict.DictMixin with collections.MutableMapping (the bsddb modules are next).	2008-02-04 20:44:31 +00:00
dummy_thread.py
dummy_threading.py
filecmp.py	Move itertools izip() code to builtins as zip(). Complete the renaming.	2008-03-13 02:09:15 +00:00
fileinput.py	Patch 1341 by Amaury Forgeot d'Arc.	2007-10-29 17:39:59 +00:00
fnmatch.py
formatter.py	Merged revisions 60151-60159,60161-60168,60170,60172-60173,60175 via svnmerge from	2008-01-21 20:36:10 +00:00
fpformat.py	Raise statement normalization in Lib/.	2007-08-30 01:19:48 +00:00
fractions.py	Forward port r62849.	2008-05-08 16:03:04 +00:00
ftplib.py	Merged revisions 62260-62261,62266,62271,62277-62279,62289-62290,62293-62298,62302-62306,62308,62311,62313-62315,62319-62321 via svnmerge from	2008-04-13 13:53:33 +00:00
functools.py
genericpath.py
getopt.py
getpass.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
gettext.py	#1535: rename __builtin__ module to builtins.	2007-12-02 09:40:06 +00:00
glob.py	Fix build error.	2008-01-27 16:16:19 +00:00
gzip.py	Merged revisions 61820-61823 via svnmerge from	2008-03-24 02:19:29 +00:00
hashlib.py	Merged revisions 61538-61540,61556,61559-61560,61563,61565,61571,61575-61576,61580-61582,61586,61591,61593,61595,61605-61606,61613-61616,61618,61621-61623,61625,61627,61631-61634 via svnmerge from	2008-03-19 21:50:51 +00:00
heapq.py	Merged revisions 61239-61249,61252-61257,61260-61264,61269-61275,61278-61279,61285-61286,61288-61290,61298,61303-61305,61312-61314,61317,61329,61332,61344,61350-61351,61363-61376,61378-61379,61382-61383,61387-61388,61392,61395-61396,61402-61403 via svnmerge from	2008-03-16 00:07:10 +00:00
hmac.py	Fixed failing unit tests due to str/bytes mismatch.	2008-03-03 02:59:49 +00:00
htmlentitydefs.py	Use strings for all entity values, as that is now possible	2007-12-29 18:38:41 +00:00
htmllib.py
HTMLParser.py	rename markupbase to _markupbase	2007-12-07 11:10:11 +00:00
httplib.py	Merged revisions 61034-61036,61038-61048 via svnmerge from	2008-02-24 13:08:18 +00:00
ihooks.py	#1535: rename __builtin__ module to builtins.	2007-12-02 09:40:06 +00:00
imaplib.py	Merged revisions 61003-61033 via svnmerge from	2008-02-24 00:38:49 +00:00
imghdr.py
inspect.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
io.py	Fixed the negative value check in io._BytesIO.seek().	2008-05-08 01:39:38 +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	Remove the imputil module.	2008-05-08 18:11:25 +00:00
locale.py	strxfrm and strcoll are conditionally defined, alwsy provide some impl	2008-03-10 04:49:25 +00:00
macpath.py	Raise statement normalization in Lib/.	2007-08-30 01:19:48 +00:00
macurl2path.py	Raise statement normalization in Lib/.	2007-08-30 01:19:48 +00:00
mailbox.py	Correct Issue#1561: test_mailbox failed on Windows.	2008-03-26 19:49:26 +00:00
mailcap.py
mhlib.py	Removed PyInt_GetMax and sys.maxint	2007-12-04 23:02:19 +00:00
mimetools.py	Raise statement normalization in Lib/.	2007-08-30 01:19:48 +00:00
mimetypes.py	Merged revisions 58221-58741 via svnmerge from	2007-11-01 19:42:39 +00:00
modulefinder.py	Merged revisions 59193-59201 via svnmerge from	2007-11-27 21:50:00 +00:00
multifile.py	Raise statement normalization in Lib/.	2007-08-30 01:19:48 +00:00
netrc.py	Patch # 1331 by Christian Heimes.	2007-10-26 04:29:23 +00:00
nntplib.py
ntpath.py	Merged revisions 60990-61002 via svnmerge from	2008-02-23 18:30:17 +00:00
nturl2path.py	Raise statement normalization in Lib/.	2007-08-30 01:19:48 +00:00
numbers.py	Merged revisions 61404-61407 via svnmerge from	2008-03-16 00:32:36 +00:00
opcode.py	Add missing UNPACK_EX opcode.	2008-03-18 20:13:50 +00:00
optparse.py	#1535: rename __builtin__ module to builtins.	2007-12-02 09:40:06 +00:00
os.py	Merged revisions 62713,62715,62728,62737,62740,62744,62749,62756 via svnmerge from	2008-05-06 13:58:24 +00:00
os2emxpath.py
pdb.doc
pdb.py	Merged revisions 61913,61915-61916,61918-61919,61922-61926,61928-61929,61931,61935,61938,61943 via svnmerge from	2008-03-26 13:45:42 +00:00
pickle.py	Removed memoryview objects from bytes_types.	2008-05-03 01:42:49 +00:00
pickletools.py	- A new pickle protocol (protocol 3) is added with explicit support	2008-03-17 22:56:06 +00:00
pipes.py	Merged revisions 57620-57771 via svnmerge from	2007-08-30 22:15:33 +00:00
pkgutil.py	Merged revisions 62350-62355,62358-62359,62364-62365,62370,62372-62375,62378-62379,62381 via svnmerge from	2008-04-19 00:55:37 +00:00
platform.py	Merged revisions 62805,62811,62841-62842,62848-62849,62853-62854 via svnmerge from	2008-05-08 17:18:53 +00:00
plistlib.py	svn cp -r60150 svn+ssh://pythondev@svn.python.org/python/branches/py3k/Lib/plat-mac/plistlib.py Lib/	2008-01-27 15:20:13 +00:00
poplib.py	Merged revisions 58095-58132,58136-58148,58151-58197 via svnmerge from	2007-09-19 03:06:30 +00:00
posixpath.py	Merged revisions 59703-59773 via svnmerge from	2008-01-06 16:59:19 +00:00
pprint.py	Update pprint() to match the new repr style for frozensets	2008-01-31 01:10:03 +00:00
profile.py
pstats.py	Issue #1771: Remove cmp parameter from list.sort() and builtin.sorted().	2008-01-30 20:15:17 +00:00
pty.py	Raise statement normalization in Lib/.	2007-08-30 01:19:48 +00:00
py_compile.py	Merged revisions 61239-61249,61252-61257,61260-61264,61269-61275,61278-61279,61285-61286,61288-61290,61298,61303-61305,61312-61314,61317,61329,61332,61344,61350-61351,61363-61376,61378-61379,61382-61383,61387-61388,61392,61395-61396,61402-61403 via svnmerge from	2008-03-16 00:07:10 +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	Remove duplicated code in pydoc.py, probably a merge conflict some months ago.	2008-04-25 20:47:52 +00:00
Queue.py	Sync-up Queue.py with Py2.6	2008-01-17 00:13:27 +00:00
quopri.py	Patch 1329 (partial) by Christian Heimes.	2007-10-30 17:27:30 +00:00
random.py	Merged revisions 61724-61725,61731-61735,61737,61739,61741,61743-61744,61753,61761,61765-61767,61769,61773,61776-61778,61780-61783,61788,61793,61796,61807,61813 via svnmerge from	2008-03-23 21:54:12 +00:00
re.py	Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552,60554,60556-60559,60561-60562,60568-60598,60600-60616 via svnmerge from	2008-02-06 14:31:34 +00:00
repr.py	#1535: rename __builtin__ module to builtins.	2007-12-02 09:40:06 +00:00
rfc822.py	Raise statement normalization in Lib/.	2007-08-30 01:19:48 +00:00
rlcompleter.py	Merged revisions 61239-61249,61252-61257,61260-61264,61269-61275,61278-61279,61285-61286,61288-61290,61298,61303-61305,61312-61314,61317,61329,61332,61344,61350-61351,61363-61376,61378-61379,61382-61383,61387-61388,61392,61395-61396,61402-61403 via svnmerge from	2008-03-16 00:07:10 +00:00
robotparser.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
runpy.py	Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552,60554,60556-60559,60561-60562,60569,60571-60572,60574,60576-60583,60585-60586,60589,60591,60594-60595,60597-60598,60600-60601,60606-60612,60615,60617,60619-60621,60623-60625,60627-60629,60631,60633,60635,60647,60650,60652,60654,60656,60658-60659,60664-60666,60668-60670,60672,60676,60678,60680-60683,60685-60686,60688,60690,60692-60694,60697-60700,60705-60706,60708,60711,60714,60720,60724-60730,60732,60736,60742,60744,60746,60748,60750-60751,60753,60756-60757,60759-60761,60763-60764,60766,60769-60770,60774-60784,60787-60789,60793,60796,60799-60809,60812-60813,60815-60821,60823-60826,60828-60829,60831-60834,60836,60838-60839,60846-60849,60852-60854,60856-60859,60861-60870,60874-60875,60880-60881,60886,60888-60890,60892,60894-60898,60900-60931,60933-60958 via svnmerge from	2008-02-22 16:37:40 +00:00
sched.py	Merged revisions 59985-60000,60002,60005-60007,60009-60042 via svnmerge from	2008-01-18 09:56:22 +00:00
sgmllib.py	rename markupbase to _markupbase	2007-12-07 11:10:11 +00:00
shelve.py	The new default protocol is two.	2008-02-10 20:41:56 +00:00
shlex.py	Patch# 1258 by Christian Heimes: kill basestring.	2007-10-16 18:12:55 +00:00
shutil.py	Merged revisions 61520,61523-61528,61532 via svnmerge from	2008-03-18 18:26:33 +00:00
SimpleHTTPServer.py	Merged revisions 61038,61042-61045,61047,61050,61053,61055-61056,61061-61062,61066,61068,61070,61083,61085,61092-61097,61103-61108 via svnmerge from	2008-02-28 20:02:27 +00:00
SimpleXMLRPCServer.py	Fixed two of the three failing xml rpc tests	2007-12-08 18:38:20 +00:00
site.py	Merged revisions 62774-62775,62785,62787-62788 via svnmerge from	2008-05-06 23:45:46 +00:00
smtpd.py	Merged revisions 58221-58741 via svnmerge from	2007-11-01 19:42:39 +00:00
smtplib.py	Merged revisions 61964-61979 via svnmerge from	2008-03-28 00:55:15 +00:00
sndhdr.py
socket.py	update to fix leak in SSL code	2007-12-14 22:08:56 +00:00
SocketServer.py	Merged revisions 61239-61249,61252-61257,61260-61264,61269-61275,61278-61279,61285-61286,61288-61290,61298,61303-61305,61312-61314,61317,61329,61332,61344,61350-61351,61363-61376,61378-61379,61382-61383,61387-61388,61392,61395-61396,61402-61403 via svnmerge from	2008-03-16 00:07:10 +00:00
sre.py
sre_compile.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
sre_constants.py
sre_parse.py	Fix 're' to work on bytes. It could do with a few more tests, though.	2008-03-18 20:19:54 +00:00
ssl.py	Merged revisions 60990-61002 via svnmerge from	2008-02-23 18:30:17 +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
statvfs.py
string.py	Rename buffer -> bytearray.	2007-11-21 19:29:53 +00:00
stringprep.py
struct.py	Merged revisions 59696-59702 via svnmerge from	2008-01-04 03:08:33 +00:00
subprocess.py	Merged revisions 62386-62387,62389-62393,62396,62400-62402,62407,62409-62410,62412-62414,62418-62419 via svnmerge from	2008-04-20 21:01:16 +00:00
sunau.py	#1535: rename __builtin__ module to builtins.	2007-12-02 09:40:06 +00:00
sunaudio.py	Raise statement normalization in Lib/.	2007-08-30 01:19:48 +00:00
symbol.py	Regenerate Lib/symbol.py.	2007-08-31 07:58:27 +00:00
symtable.py	Raise statement normalization in Lib/.	2007-08-30 01:19:48 +00:00
tabnanny.py
tarfile.py	Issue #2058: Remove the buf attribute and add __slots__ to the	2008-04-14 10:05:48 +00:00
telnetlib.py	Raise statement normalization in Lib/.	2007-08-30 01:19:48 +00:00
tempfile.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
textwrap.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
this.py
threading.py	Merged revisions 61440-61441,61443,61445-61448,61451-61452,61455-61457,61459-61464,61466-61467,61469-61470,61476-61477,61479,61481-61482,61485,61487,61490,61493-61494,61497,61499-61502,61505-61506,61508,61511-61514,61519,61521-61522,61530-61531,61533-61537,61541-61555,61557-61558,61561-61562,61566-61569,61572-61574,61578-61579,61583-61584,61588-61589,61592,61594,61598-61601,61603-61604,61607-61612,61617,61619-61620,61624,61626,61628-61630,61635-61638,61640-61643,61645,61648,61653-61655,61659-61662,61664,61666,61668-61671,61673,61675,61679-61680,61682,61685-61686,61689-61695,61697-61699,61701-61703,61706,61710,61713,61717,61723,61726-61730,61736,61738,61740,61742,61745-61752,61754-61760,61762-61764,61768,61770-61772,61774-61775,61784-61787,61789-61792,61794-61795,61797-61806,61808-61809,61811-61812,61814-61819,61824,61826-61833,61835-61840,61843-61845,61848,61850,61854-61862,61865-61866,61868,61872-61873,61876-61877,61883-61888,61890-61891,61893-61899,61901-61903,61905-61912,61914,61917,61920-61921,61927,61930,61932-61934,61939,61941-61942,61944-61951,61955,61960-61963,61980,61982-61983,61991,61994-61996,62001-62003,62008-62010,62016-62017,62022,62024,62027,62031-62034,62041,62045-62046,62055-62058,62060-62066,62068-62074,62076-62079,62081-62083,62086-62089,62092-62094,62098,62101,62104,62106-62109,62115-62122,62124-62125,62127-62128,62130,62132,62134-62137,62139-62142,62144,62146-62148,62150-62152,62155-62161 via svnmerge from	2008-04-05 04:47:45 +00:00
timeit.py	Patch# 1258 by Christian Heimes: kill basestring.	2007-10-16 18:12:55 +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	Merged revisions 61964-61979 via svnmerge from	2008-03-28 00:55:15 +00:00
trace.py	Bug #2606: Avoid calling .sort() on a dict_keys object.	2008-04-10 19:02:25 +00:00
traceback.py	#1535: rename __builtin__ module to builtins.	2007-12-02 09:40:06 +00:00
tty.py
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
unittest.py	Convert some custom sort comparison functions to equivalent key functions.	2008-01-30 02:55:10 +00:00
urllib.py	Fix merge glitch that let test_urllib fail.	2008-01-26 11:23:13 +00:00
urllib2.py	Merged revisions 62713,62715,62728,62737,62740,62744,62749,62756 via svnmerge from	2008-05-06 13:58:24 +00:00
urlparse.py	Merged revisions 60151-60159,60161-60168,60170,60172-60173,60175 via svnmerge from	2008-01-21 20:36:10 +00:00
uu.py	Patch# 1258 by Christian Heimes: kill basestring.	2007-10-16 18:12:55 +00:00
uuid.py	Rename buffer -> bytearray.	2007-11-21 19:29:53 +00:00
warnings.py	Merged revisions 62774-62775,62785,62787-62788 via svnmerge from	2008-05-06 23:45:46 +00:00
wave.py	#1535: rename __builtin__ module to builtins.	2007-12-02 09:40:06 +00:00
weakref.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
webbrowser.py	Patch# 1258 by Christian Heimes: kill basestring.	2007-10-16 18:12:55 +00:00
whichdb.py
wsgiref.egg-info
xdrlib.py	Raise statement normalization in Lib/.	2007-08-30 01:19:48 +00:00
xmlrpclib.py	Merged revisions 62350-62355,62358-62359,62364-62365,62370,62372-62375,62378-62379,62381 via svnmerge from	2008-04-19 00:55:37 +00:00
zipfile.py	Merged revisions 62724 via svnmerge from	2008-05-05 17:44:38 +00:00