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	…
multiprocessing	Merged revisions 83722 via svnmerge from	2010-08-04 15:54:19 +00:00
plat-aix4	…
plat-atheos	…
plat-darwin	…
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	…
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	…
__phello__.foo.py	…
_abcoll.py	Merged revisions 84301 via svnmerge from	2010-08-24 21:00:32 +00:00
_compat_pickle.py	…
_dummy_thread.py	…
_markupbase.py	…
_pyio.py	Merged revisions 84814 via svnmerge from	2010-09-14 18:53:07 +00:00
_strptime.py	…
_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	…
antigravity.py	…
ast.py	remove support for byte literals; a new feature	2010-07-18 14:36:12 +00:00
asynchat.py	…
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	…
bisect.py	…
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	…
cgi.py	Merged revisions 83901 via svnmerge from	2010-08-09 20:08:48 +00:00
cgitb.py	…
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	…
collections.py	Issue #9826: Handle recursive repr in collections.OrderedDict.	2010-09-12 05:28:42 +00:00
colorsys.py	…
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	…
copy.py	Merged revisions 84495-84497 via svnmerge from	2010-09-04 17:49:13 +00:00
copyreg.py	…
csv.py	…
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	…
doctest.py	Merged revisions 84106 via svnmerge from	2010-08-16 20:26:04 +00:00
dummy_threading.py	…
filecmp.py	…
fileinput.py	…
fnmatch.py	Merged revisions 82766 via svnmerge from	2010-07-10 14:00:10 +00:00
formatter.py	…
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	…
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	…
gzip.py	Merged revisions 85291 via svnmerge from	2010-10-06 21:29:56 +00:00
hashlib.py	…
heapq.py	…
hmac.py	…
imaplib.py	Merged revisions 84195 via svnmerge from	2010-08-19 07:04:27 +00:00
imghdr.py	…
inspect.py	Merged revisions 84106 via svnmerge from	2010-08-16 20:26:04 +00:00
io.py	…
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	…
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	…
modulefinder.py	…
netrc.py	…
nntplib.py	…
ntpath.py	Merged revisions 83065 via svnmerge from	2010-08-01 21:27:48 +00:00
nturl2path.py	…
numbers.py	…
opcode.py	…
optparse.py	…
os.py	Merged revisions 80421,80424 via svnmerge from	2010-04-25 22:39:07 +00:00
os2emxpath.py	…
pdb.doc	…
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	…
platform.py	Merged revisions 83644 via svnmerge from	2010-08-03 07:43:36 +00:00
plistlib.py	…
poplib.py	…
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	…
py_compile.py	…
pyclbr.py	…
pydoc.py	Merged revisions 83370,83372-83374,83384 via svnmerge from	2010-08-01 19:09:07 +00:00
queue.py	…
quopri.py	…
random.py	Issue #7435: Remove reference to long in docstring. Thanks flox.	2009-12-05 20:32:49 +00:00
re.py	…
reprlib.py	…
rlcompleter.py	…
runpy.py	…
sched.py	…
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	…
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	…
sre_constants.py	…
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	…
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	…
symtable.py	…
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	…
tempfile.py	Merged revisions 76593 via svnmerge from	2009-11-30 00:16:44 +00:00
textwrap.py	…
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	…
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	…
wsgiref.egg-info	…
xdrlib.py	…
zipfile.py	Merged revisions 83959-83960 via svnmerge from	2010-08-12 15:30:13 +00:00