Amaury Forgeot d'Arc cef5b3d411 Remove duplicated code in pydoc.py, probably a merge conflict some months ago. ...

Spotted by Humberto Diogenes.

2008-04-25 20:47:52 +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 62338 via svnmerge from

2008-04-14 16:17:33 +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 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

email

Merged revisions 60990-61002 via svnmerge from

2008-02-23 18:30:17 +00:00

encodings

…

idlelib

release.py induced and manual editing steps for 3.0a4.

2008-04-02 23:33:27 +00:00

lib2to3

Merged revisions 62263 via svnmerge from

2008-04-10 02:50:50 +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

logging

Merged revisions 62090-62091,62096,62100,62102,62110-62114 via svnmerge from

2008-04-02 21:49:44 +00:00

msilib

…

plat-aix4

…

plat-atheos

…

plat-darwin

…

plat-freebsd4

…

plat-freebsd5

…

plat-freebsd6

…

plat-freebsd7

…

plat-freebsd8

…

plat-generic

…

plat-linux2

…

plat-mac

Merged revisions 62021,62029,62035-62038,62043-62044,62052-62053 via svnmerge from

2008-03-31 01:51:45 +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 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

test

Correct recently merged tests:

2008-04-24 21:00:04 +00:00

wsgiref

…

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

…

_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

…

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

…

anydbm.py

…

asynchat.py

…

asyncore.py

…

base64.py

…

BaseHTTPServer.py

…

bdb.py

Merged revisions 62018 via svnmerge from

2008-03-30 20:43:50 +00:00

binhex.py

…

bisect.py

…

build_class.py

…

calendar.py

…

cgi.py

…

CGIHTTPServer.py

…

cgitb.py

…

chunk.py

…

cmd.py

…

code.py

…

codecs.py

Make TextIOWrapper's seek/tell work properly with stateful decoders;

2008-03-18 04:51:32 +00:00

codeop.py

…

collections.py

…

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

…

contextlib.py

…

Cookie.py

…

cookielib.py

…

copy_reg.py

…

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

cProfile.py

…

csv.py

Obvious simplification, now that "long" has disappeared.

2008-04-24 18:26:53 +00:00

dbhash.py

…

decimal.py

Merged revisions 61892,61900 via svnmerge from

2008-03-26 12:55:56 +00:00

difflib.py

…

dircache.py

…

dis.py

…

doctest.py

…

DocXMLRPCServer.py

…

dumbdbm.py

…

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

…

fnmatch.py

…

formatter.py

…

fpformat.py

…

fractions.py

…

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

…

gettext.py

…

glob.py

…

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

…

htmllib.py

…

HTMLParser.py

…

httplib.py

Merged revisions 61034-61036,61038-61048 via svnmerge from

2008-02-24 13:08:18 +00:00

ihooks.py

…

imaplib.py

Merged revisions 61003-61033 via svnmerge from

2008-02-24 00:38:49 +00:00

imghdr.py

…

imputil.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

Fix problems in the io docs noted by Alexandre Vassalotti

2008-04-14 21:30:21 +00:00

keyword.py

…

linecache.py

…

locale.py

strxfrm and strcoll are conditionally defined, alwsy provide some impl

2008-03-10 04:49:25 +00:00

macpath.py

…

macurl2path.py

…

mailbox.py

Correct Issue#1561: test_mailbox failed on Windows.

2008-03-26 19:49:26 +00:00

mailcap.py

…

mhlib.py

…

mimetools.py

…

mimetypes.py

…

modulefinder.py

…

multifile.py

…

mutex.py

…

netrc.py

…

nntplib.py

…

ntpath.py

Merged revisions 60990-61002 via svnmerge from

2008-02-23 18:30:17 +00:00

nturl2path.py

…

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

…

os2emxpath.py

…

os.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

- A new pickle protocol (protocol 3) is added with explicit support

2008-03-17 22:56:06 +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

…

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 61672,61674,61676-61678,61681,61683-61684 via svnmerge from

2008-03-21 01:11:52 +00:00

plistlib.py

…

poplib.py

…

posixpath.py

…

pprint.py

…

profile.py

…

pstats.py

…

pty.py

…

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

…

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

…

quopri.py

…

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

…

repr.py

…

rfc822.py

…

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

…

runpy.py

…

sched.py

…

sgmllib.py

…

shelve.py

…

shlex.py

…

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

…

site.py

…

smtpd.py

…

smtplib.py

Merged revisions 61964-61979 via svnmerge from

2008-03-28 00:55:15 +00:00

sndhdr.py

…

socket.py

…

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_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

sre.py

…

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

…

stringprep.py

…

struct.py

…

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

…

sunaudio.py

…

symbol.py

…

symtable.py

…

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

…

tempfile.py

As Guido says

2008-02-28 22:21:11 +00:00

textwrap.py

…

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

…

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

…

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

…

urllib2.py

Merged revisions 62246-62259 via svnmerge from

2008-04-10 03:06:53 +00:00

urllib.py

…

urlparse.py

…

user.py

…

uu.py

…

uuid.py

…

warnings.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

wave.py

…

weakref.py

…

webbrowser.py

…

whichdb.py

…

wsgiref.egg-info

…

xdrlib.py

…

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

- Revert a change that should have been blocked: py3k has no -3 flag!

2008-03-20 00:35:03 +00:00