Antoine Pitrou a0bf56d4f1 Merged revisions 85423 via svnmerge from ... svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r85423 | antoine.pitrou | 2010-10-13 19:14:16 +0200 (mer., 13 oct. 2010) | 3 lines Protect test_smtpnet against connection failures ........		2010-10-13 17:19:55 +00:00
..
ctypes	Merged revisions 84836 via svnmerge from	2010-09-15 13:08:12 +00:00
curses	Merged revisions 82805-82806,83523-83527,83536,83538,83542,83546-83548,83550-83555,83558,83560 via svnmerge from	2010-10-06 08:26:09 +00:00
dbm	Backporting since it would have helped us find a regression.	2009-10-27 13:08:37 +00:00
distutils	Merged revisions 82805-82806,83523-83527,83536,83538,83542,83546-83548,83550-83555,83558,83560 via svnmerge from	2010-10-06 08:26:09 +00:00
email	Merged revisions 85179 via svnmerge from	2010-10-02 16:04:44 +00:00
encodings	Merged revisions 81474 via svnmerge from	2010-05-22 17:01:13 +00:00
html	Merged revisions 81504 via svnmerge from	2010-05-24 21:48:07 +00:00
http	Merged revisions 85205 via svnmerge from	2010-10-03 18:25:01 +00:00
idlelib	Merged revisions 83103 via svnmerge from	2010-07-23 16:50:08 +00:00
importlib	Merged revisions 78242 via svnmerge from	2010-02-19 16:05:28 +00:00
json	Merged revisions 82805-82806,83523-83527,83536,83538,83542,83546-83548,83550-83555,83558,83560 via svnmerge from	2010-10-06 08:26:09 +00:00
lib2to3	Merged revisions 83845 via svnmerge from	2010-08-08 19:23:25 +00:00
logging	Issue #9947: logging: backported locking fix from py3k.	2010-09-27 21:51:36 +00:00
msilib	Merged revisions 73390 via svnmerge from	2009-06-12 17:31:41 +00:00
multiprocessing	Merged revisions 83722 via svnmerge from	2010-08-04 15:54:19 +00:00
plat-aix4	…
plat-atheos	…
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	…
plat-sunos5	…
plat-unixware7	…
pydoc_data	update pydoc-topics	2009-06-26 13:05:03 +00:00
site-packages	…
sqlite3	Merged revisions 80349 via svnmerge from	2010-04-22 11:24:50 +00:00
test	Merged revisions 85423 via svnmerge from	2010-10-13 17:19:55 +00:00
tkinter	Merged revisions 85018 via svnmerge from	2010-10-09 10:28:02 +00:00
urllib	Merged revisions 85025 via svnmerge from	2010-09-27 01:28:10 +00:00
wsgiref	Manually copy patch for bug 7250 from the release26-maint branch. I suck	2010-03-01 21:56:18 +00:00
xml	Merged revisions 82629,82632,82724,82757-82758,82760-82763,82798-82799,82801 via svnmerge from	2010-10-06 08:13:26 +00:00
xmlrpc	Merged revisions 80112 via svnmerge from	2010-04-16 15:48:19 +00:00
__future__.py	barry has already been causing test breakage	2009-04-01 20:38:13 +00:00
__phello__.foo.py	…
_abcoll.py	Merged revisions 84301 via svnmerge from	2010-08-24 21:00:32 +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 84814 via svnmerge from	2010-09-14 18:53:07 +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 84344 via svnmerge from	2010-08-28 18:27:09 +00:00
_weakrefset.py	(note: svnmerged from py3k, but the original message was wrong)	2010-01-08 17:56:16 +00:00
abc.py	Merged revisions 77791 via svnmerge from	2010-01-27 02:28:22 +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	remove support for byte literals; a new feature	2010-07-18 14:36:12 +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	Merged revisions 84284 via svnmerge from	2010-08-23 21:56:11 +00:00
base64.py	Merged revisions 81533 via svnmerge from	2010-05-25 21:32:42 +00:00
bdb.py	Merged revisions 83259,83261,83264-83265,83268-83269,83271-83272,83281 via svnmerge from	2010-08-01 19:35:16 +00:00
binhex.py	Merged revisions 74289 via svnmerge from	2009-08-02 20:09:59 +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	Merged revisions 82805-82806,83523-83527,83536,83538,83542,83546-83548,83550-83555,83558,83560 via svnmerge from	2010-10-06 08:26:09 +00:00
calendar.py	#3059: Stop decoding Unicode in calendar module.	2008-06-08 08:40:05 +00:00
cgi.py	Merged revisions 83901 via svnmerge from	2010-08-09 20:08:48 +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	Merged revisions 83380 via svnmerge from	2010-08-01 04:14:22 +00:00
code.py	…
codecs.py	Merged revisions 81474 via svnmerge from	2010-05-22 17:01:13 +00:00
codeop.py	Merged revisions 75472 via svnmerge from	2009-10-18 00:34:08 +00:00
collections.py	Issue #9826: Handle recursive repr in collections.OrderedDict.	2010-09-12 05:28:42 +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 78991-78992,78994 via svnmerge from	2010-03-21 22:02:42 +00:00
configparser.py	Merged revisions 83226-83227,83229-83232 via svnmerge from	2010-08-01 21:03:01 +00:00
contextlib.py	Merged revisions 73518-73519 via svnmerge from	2009-06-23 10:55:52 +00:00
copy.py	Merged revisions 84495-84497 via svnmerge from	2010-09-04 17:49:13 +00:00
copyreg.py	…
csv.py	Merged revisions 75231 via svnmerge from	2009-10-04 14:54:52 +00:00
decimal.py	Merged revisions 82654 via svnmerge from	2010-07-08 21:18:21 +00:00
difflib.py	Merged revisions 76469 via svnmerge from	2009-11-23 19:06:11 +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 84106 via svnmerge from	2010-08-16 20:26:04 +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 82766 via svnmerge from	2010-07-10 14:00:10 +00:00
formatter.py	Fix formatter usage of filter(). Bug #3800.	2008-09-09 19:31:25 +00:00
fractions.py	Merged revisions 76458 via svnmerge from	2009-11-23 16:28:18 +00:00
ftplib.py	Merged revisions 80228 via svnmerge from	2010-04-19 22:10:56 +00:00
functools.py	Issue 8814: functools.wraps() did not copy __annotations__.	2010-08-08 00:56:52 +00:00
genericpath.py	Issue #3187: Better support for "undecodable" filenames. Code by Victor	2008-10-02 18:55:37 +00:00
getopt.py	Merged revisions 83116 via svnmerge from	2010-07-24 01:11:58 +00:00
getpass.py	Merged revisions 76017 via svnmerge from	2009-11-01 18:48:31 +00:00
gettext.py	Merged revisions 85223 via svnmerge from	2010-10-04 23:57:46 +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	Merged revisions 85291 via svnmerge from	2010-10-06 21:29:56 +00:00
hashlib.py	issue3715: docstring representation of hex escaped string needs to be double	2008-08-31 16:35:01 +00:00
heapq.py	Make life easier for non-CPython implementations	2009-03-29 19:30:50 +00:00
hmac.py	…
imaplib.py	Merged revisions 84195 via svnmerge from	2010-08-19 07:04:27 +00:00
imghdr.py	Merged revisions 65713 via svnmerge from	2008-08-16 16:48:16 +00:00
inspect.py	Merged revisions 84106 via svnmerge from	2010-08-16 20:26:04 +00:00
io.py	add myself	2009-05-01 20:45:43 +00:00
keyword.py	…
linecache.py	Merged revisions 85090 via svnmerge from	2010-09-29 01:31:23 +00:00
locale.py	Merged revisions 80521 via svnmerge from	2010-09-05 22:40:41 +00:00
macpath.py	Note: only the relevant parts of r79474 are merged.	2010-03-28 11:42:38 +00:00
macurl2path.py	Fixing Issue6711 - macurl2path has typos that raise AttributeError	2009-08-16 06:44:28 +00:00
mailbox.py	Merged revisions 83385-83389,83391 via svnmerge from	2010-08-01 19:04:55 +00:00
mailcap.py	Merged revisions 80368-80369 via svnmerge from	2010-04-22 13:56:42 +00:00
mimetypes.py	Fix default value in docstring.	2009-06-08 09:07:34 +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	Merged revisions 83065 via svnmerge from	2010-08-01 21:27:48 +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	http://bugs.python.org/issue4715	2009-02-25 02:25:04 +00:00
optparse.py	Merged revisions 71540,71563 via svnmerge from	2009-04-27 16:41:41 +00:00
os.py	Merged revisions 80421,80424 via svnmerge from	2010-04-25 22:39:07 +00:00
os2emxpath.py	…
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 83259,83261,83264-83265,83268-83269,83271-83272,83281 via svnmerge from	2010-08-01 19:35:16 +00:00
pickle.py	Merged revisions 82937 via svnmerge from	2010-07-17 23:01:39 +00:00
pickletools.py	Merged revisions 83212,83829,83833,83838-83839,83878,84019,84025,84028,84032,84036 via svnmerge from	2010-08-14 18:24:40 +00:00
pipes.py	Merged revisions 81365,81367 via svnmerge from	2010-05-19 21:22:58 +00:00
pkgutil.py	Merged revisions 73833,73838,73850-73852,73856-73857 via svnmerge from	2009-08-13 09:04:31 +00:00
platform.py	Merged revisions 83644 via svnmerge from	2010-08-03 07:43:36 +00:00
plistlib.py	Merged revisions 74813 via svnmerge from	2009-09-16 00:57:27 +00:00
poplib.py	Merged revisions 74330 via svnmerge from	2009-08-06 16:08:07 +00:00
posixpath.py	Merged revisions 83393,83396,83398,83404-83405,83408 via svnmerge from	2010-08-01 18:56:30 +00:00
pprint.py	Issue 3976: fix pprint for sets, frozensets, and dicts containing unorderable types.	2009-11-19 01:02:56 +00:00
profile.py	Merged revisions 82805-82806,83523-83527,83536,83538,83542,83546-83548,83550-83555,83558,83560 via svnmerge from	2010-10-06 08:26:09 +00:00
pstats.py	Merged revisions 82805-82806,83523-83527,83536,83538,83542,83546-83548,83550-83555,83558,83560 via svnmerge from	2010-10-06 08:26:09 +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	…
pydoc.py	Merged revisions 83370,83372-83374,83384 via svnmerge from	2010-08-01 19:09:07 +00:00
queue.py	port the queue change r70405	2009-03-21 17:36:10 +00:00
quopri.py	…
random.py	Issue #7435: Remove reference to long in docstring. Thanks flox.	2009-12-05 20:32:49 +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	- remove svn:executable property from some library files	2009-06-22 14:17:00 +00:00
sched.py	Merged revisions 72932 via svnmerge from	2009-05-26 07:51:03 +00:00
shelve.py	Merged revisions 78145 via svnmerge from	2010-02-11 03:06:51 +00:00
shlex.py	…
shutil.py	Merged revisions 80840 via svnmerge from	2010-05-05 22:44:06 +00:00
site.py	Merged revisions 85386-85387,85389 via svnmerge from	2010-10-12 22:56:55 +00:00
smtpd.py	Merged revisions 84289 via svnmerge from	2010-08-23 22:34:37 +00:00
smtplib.py	Merged revisions 75064 via svnmerge from	2009-09-25 21:38:29 +00:00
sndhdr.py	Merged revisions 82856-82857 via svnmerge from	2010-07-13 23:19:20 +00:00
socket.py	Merged revisions 85420 via svnmerge from	2010-10-13 16:25:33 +00:00
socketserver.py	Merged revisions 80487,80489 via svnmerge from	2010-04-25 22:26:08 +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 78729 via svnmerge from	2010-03-06 15:27:04 +00:00
ssl.py	Merged revisions 84807 via svnmerge from	2010-09-14 14:47:08 +00:00
stat.py	…
string.py	Merged revisions 75074 via svnmerge from	2009-09-26 12:35:01 +00:00
stringprep.py	…
struct.py	Merged revisions 81947-81950,81955-81956 via svnmerge from	2010-06-12 19:18:51 +00:00
subprocess.py	Merged revisions 76923,76926,77009,77082-77083,77085,77087,77121 via svnmerge from	2010-10-06 07:17:29 +00:00
sunau.py	Merged revisions 81809 via svnmerge from	2010-06-07 20:24:48 +00:00
symbol.py	Merged revisions 73196,73278-73280,73299,73308,73312-73313,73317-73318,73321,73324,73331,73335,73340,73363 via svnmerge from	2009-06-11 22:54:11 +00:00
symtable.py	Merged revisions 70801,70809 via svnmerge from	2009-03-31 15:26:37 +00:00
tabnanny.py	Merged revisions 81393 via svnmerge from	2010-05-21 10:53:32 +00:00
tarfile.py	Merged revisions 85211 via svnmerge from	2010-10-04 15:31:05 +00:00
telnetlib.py	Merged revisions 74217,74224 via svnmerge from	2009-08-13 08:39:33 +00:00
tempfile.py	Merged revisions 76593 via svnmerge from	2009-11-30 00:16:44 +00:00
textwrap.py	Merged revisions 75231 via svnmerge from	2009-10-04 14:54:52 +00:00
this.py	…
threading.py	Merged revisions 79819 via svnmerge from	2010-04-06 03:36:00 +00:00
timeit.py	Merged revisions 83393,83396,83398,83404-83405,83408 via svnmerge from	2010-08-01 18:56:30 +00:00
token.py	…
tokenize.py	Merged revisions 84364 via svnmerge from	2010-08-30 14:44:53 +00:00
trace.py	Merged revisions 82805-82806,83523-83527,83536,83538,83542,83546-83548,83550-83555,83558,83560 via svnmerge from	2010-10-06 08:26:09 +00:00
traceback.py	Merged revisions 76573 via svnmerge from	2009-11-28 16:16:09 +00:00
tty.py	…
turtle.py	Note: only the relevant parts of r79474 are merged.	2010-03-28 11:42:38 +00:00
types.py	…
unittest.py	Fix typo in assertSequenceEqual docstring.	2010-01-29 22:26:45 +00:00
uu.py	Merged revisions 74821,74828-74831,74833,74835 via svnmerge from	2009-09-16 16:05:59 +00:00
uuid.py	Merged revisions 76884-76885,76887,76889-76890,76895 via svnmerge from	2010-10-06 07:12:17 +00:00
warnings.py	Merged revisions 75797 via svnmerge from	2009-10-27 20:24:45 +00:00
wave.py	Merged revisions 77459 via svnmerge from	2010-01-13 03:53:14 +00:00
weakref.py	(note: svnmerged from py3k, but the original message was wrong)	2010-01-08 17:56:16 +00:00
webbrowser.py	Merged revisions 74745 via svnmerge from	2009-09-11 22:36:27 +00:00
wsgiref.egg-info	…
xdrlib.py	…
zipfile.py	Merged revisions 83959-83960 via svnmerge from	2010-08-12 15:30:13 +00:00