diff options
author | Benjamin Peterson <benjamin@python.org> | 2010-12-04 02:24:43 (GMT) |
---|---|---|
committer | Benjamin Peterson <benjamin@python.org> | 2010-12-04 02:24:43 (GMT) |
commit | 76f05b70d7ab439fd56ec07ca2770649980f1800 (patch) | |
tree | c762c81d087fa26607410b9c5b08c59ae58d4c21 /Lib/_compat_pickle.py | |
parent | 36a508fee63f4bbd5cc816f2a55d2197d6e34976 (diff) | |
download | cpython-76f05b70d7ab439fd56ec07ca2770649980f1800.zip cpython-76f05b70d7ab439fd56ec07ca2770649980f1800.tar.gz cpython-76f05b70d7ab439fd56ec07ca2770649980f1800.tar.bz2 |
Merged revisions 87002 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
................
r87002 | martin.v.loewis | 2010-12-03 17:11:07 -0600 (Fri, 03 Dec 2010) | 21 lines
Merged revisions 85551,86156-86157,86464 via svnmerge from
svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3
........
r85551 | benjamin.peterson | 2010-10-15 23:57:29 +0200 (Fr, 15 Okt 2010) | 1 line
escape() is now in the html module
........
r86156 | georg.brandl | 2010-11-04 09:34:57 +0100 (Do, 04 Nov 2010) | 1 line
Consistency fixes in option parser help texts.
........
r86157 | georg.brandl | 2010-11-04 09:35:30 +0100 (Do, 04 Nov 2010) | 1 line
#10286: fix urllib class names.
........
r86464 | benjamin.peterson | 2010-11-14 16:28:52 +0100 (So, 14 Nov 2010) | 1 line
match only .py files #10416
........
................
Diffstat (limited to 'Lib/_compat_pickle.py')
0 files changed, 0 insertions, 0 deletions