Senthil Kumaran 4649299dc3 Merged revisions 78431 via svnmerge from ...

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r78431 | senthil.kumaran | 2010-02-25 02:25:31 +0530 (Thu, 25 Feb 2010) | 4 lines

  Fix for Issue7540 ; urllib2 will raise a TypeError when you try to add_data to
  a existing req object already having data.
........

2010-02-24 20:58:58 +00:00

..

bsddb

Merged revisions 78412 via svnmerge from

2010-02-24 02:35:33 +00:00

compiler

Merged revisions 67654,67676-67677,67681,67692,67725,67746,67748,67761,67784-67785,67787-67788,67802,67832,67848-67849,67859,67862-67864,67880,67882,67885,67889-67892,67895 via svnmerge from

2008-12-21 17:01:26 +00:00

ctypes

Merged revisions 78380 via svnmerge from

2010-02-23 20:17:14 +00:00

curses

…

distutils

Merged revisions 69304 via svnmerge from

2010-02-03 22:06:03 +00:00

email

Merged revisions 78274 via svnmerge from

2010-02-21 04:30:12 +00:00

encodings

…

hotshot

…

idlelib

bumping to 2.6.4

2009-10-26 01:48:07 +00:00

json

Merged revisions 66801,66803-66804,66813,66854-66856,66866,66870-66872,66874,66887,66903,66905,66911,66913,66927,66932,66938,66942,66962,66964,66973-66974,66977,66992,66998-66999,67002,67005,67007,67028,67040-67041,67044,67070,67089,67091,67101,67117-67119,67123-67124 via svnmerge from

2008-11-07 08:56:27 +00:00

lib2to3

Merged revisions 78408 via svnmerge from

2010-02-24 02:26:59 +00:00

lib-tk

Merged revisions 75115 via svnmerge from

2009-09-28 18:45:13 +00:00

logging

Issue #7403: Fixed possible race condition in lock creation.

2009-11-27 14:03:36 +00:00

msilib

Merged revisions 73390 via svnmerge from

2009-06-13 09:07:01 +00:00

multiprocessing

Merged revisions 77038 via svnmerge from

2009-12-24 15:21:47 +00:00

plat-aix3

…

plat-aix4

…

plat-atheos

…

plat-beos5

…

plat-darwin

…

plat-freebsd4

…

plat-freebsd5

…

plat-freebsd6

…

plat-freebsd7

…

plat-freebsd8

…

plat-generic

…

plat-irix5

…

plat-irix6

…

plat-linux2

…

plat-mac

Merged revisions 78035,78040,78043,78049-78050,78052-78054 via svnmerge from

2010-02-07 12:01:19 +00:00

plat-netbsd1

…

plat-next3

…

plat-os2emx

…

plat-riscos

…

plat-sunos5

…

plat-unixware7

…

site-packages

…

sqlite3

Remove usage of apply() in sqlite3 to silence warnings under -3.

2008-08-04 21:19:41 +00:00

test

Merged revisions 78431 via svnmerge from

2010-02-24 20:58:58 +00:00

wsgiref

Merged revisions 73952 via svnmerge from

2009-07-11 14:37:20 +00:00

xml

Issue 2235: Py3k warnings are now emitted for classes that will no longer inherit a__hash__ implementation from a parent class in Python 3.x. The standard library and test suite have been updated to not emit these warnings.

2008-08-11 15:45:58 +00:00

__future__.py

…

__phello__.foo.py

…

_abcoll.py

Issue 6037: MutableSequence.__iadd__ should return self.

2009-05-18 15:56:38 +00:00

_LWPCookieJar.py

…

_MozillaCookieJar.py

…

_strptime.py

…

_threading_local.py

Merged revisions 76117 via svnmerge from

2009-11-05 13:44:28 +00:00

abc.py

revert r77790. it requires a new-style class change

2010-01-28 01:31:13 +00:00

aifc.py

Merged revisions 72422,72425-72426 via svnmerge from

2009-05-07 16:45:44 +00:00

anydbm.py

…

ast.py

Merged revisions 66984 via svnmerge from

2008-10-20 21:43:57 +00:00

asynchat.py

warnings.catch_warnings() now returns a list or None instead of the custom

2008-09-09 00:49:16 +00:00

asyncore.py

Merged revisions 70873,70904,70934,71490,71553,71579 via svnmerge from

2009-04-15 23:00:41 +00:00

atexit.py

…

audiodev.py

…

base64.py

…

BaseHTTPServer.py

Merged revisions 78299 via svnmerge from

2010-02-22 10:57:29 +00:00

Bastion.py

…

bdb.py

Merged revisions 67750-67751 via svnmerge from

2008-12-14 11:30:16 +00:00

binhex.py

…

bisect.py

…

calendar.py

…

cgi.py

Merged revisions 72458 via svnmerge from

2009-05-08 02:47:02 +00:00

CGIHTTPServer.py

Merged revisions 76212 via svnmerge from

2009-11-11 17:24:53 +00:00

cgitb.py

…

chunk.py

…

cmd.py

…

code.py

#1288615: Python code.interact() and non-ASCII input

2008-08-07 18:42:40 +00:00

codecs.py

…

codeop.py

…

collections.py

Fix field name conflicts for named tuples.

2009-05-27 02:17:26 +00:00

colorsys.py

…

commands.py

Merged revisions 72458 via svnmerge from

2009-05-08 02:47:02 +00:00

compileall.py

…

ConfigParser.py

Merged revisions 71564 via svnmerge from

2009-04-13 12:37:59 +00:00

contextlib.py

…

Cookie.py

Merged revisions 73206,73232,73299,73683,74020,74185,74544,74643,74647,74817,74838-74839,74865,74946,75402,75459,75604,75696 via svnmerge from

2009-10-27 15:39:53 +00:00

cookielib.py

Update __all__ for cookielib, csv, os, and urllib2 for objects imported into

2008-08-18 00:46:22 +00:00

copy_reg.py

…

copy.py

…

cProfile.py

…

csv.py

Update __all__ for cookielib, csv, os, and urllib2 for objects imported into

2008-08-18 00:46:22 +00:00

dbhash.py

Deprecate bsddb for removal in Python 3.0.

2008-09-05 18:33:51 +00:00

decimal.py

Merged revisions 77324 via svnmerge from

2010-01-06 16:21:27 +00:00

difflib.py

Merged revisions 76464 via svnmerge from

2009-11-23 18:54:33 +00:00

dircache.py

…

dis.py

…

doctest.py

Issue 5021: doctest.testfile should set __name__

2009-01-27 10:30:26 +00:00

DocXMLRPCServer.py

Remove a dict.has_key() use in DocXMLRPCServer that comes up under -3.

2008-08-03 22:59:46 +00:00

dumbdbm.py

…

dummy_thread.py

Remove imports of 'warnings' that are no longer needed in dummy_thread,

2008-08-17 22:10:11 +00:00

dummy_threading.py

…

filecmp.py

Remove imports of 'warnings' that are no longer needed in dummy_thread,

2008-08-17 22:10:11 +00:00

fileinput.py

Remove a use of callable() in fileinput to silence a -3 warning.

2008-08-03 23:52:32 +00:00

fnmatch.py

Merged revisions 74475 via svnmerge from

2009-11-01 20:33:31 +00:00

formatter.py

…

fpformat.py

…

fractions.py

Merged revisions 76456 via svnmerge from

2009-11-23 16:25:51 +00:00

ftplib.py

Merged revisions 71217 via svnmerge from

2009-04-05 10:51:10 +00:00

functools.py

Copy reduce() to _functools so to have functools.reduce() not raise a warning

2008-08-09 23:30:55 +00:00

genericpath.py

…

getopt.py

…

getpass.py

Merged revisions 76000 via svnmerge from

2009-11-01 18:31:13 +00:00

gettext.py

…

glob.py

Merged revisions 70866-70868,70870-70871,70893,70896,70902,70905,70907,70912,70915,70927,70933,70940,70944,70954,70963,70998,71056 via svnmerge from

2009-04-05 21:21:05 +00:00

gzip.py

Merged revisions 72458 via svnmerge from

2009-05-08 02:47:02 +00:00

hashlib.py

issue3715: docstring representation of hex escaped string needs to be double

2008-08-31 16:34:18 +00:00

heapq.py

Fix typo (already fixed in 2.7).

2009-07-31 20:21:08 +00:00

hmac.py

silence callable warning in hmac

2008-08-19 19:07:38 +00:00

htmlentitydefs.py

…

htmllib.py

…

HTMLParser.py

…

httplib.py

Issue: 7291. 2.6 backport missed the headers argument. Fixed it.

2009-12-24 00:51:34 +00:00

ihooks.py

…

imaplib.py

Merged revisions 77222 via svnmerge from

2010-01-02 02:44:28 +00:00

imghdr.py

#3424 rearrange the order of tests in imghdr to place more common types first

2008-08-16 16:29:02 +00:00

imputil.py

Merged revisions 72558,72745,72750,72876,73042,73045-73048,73069,73089,73163,73186,73213,73215,73217,73257-73258,73260 via svnmerge from

2009-10-27 14:19:50 +00:00

inspect.py

Merged revisions 74285 via svnmerge from

2009-08-02 15:41:08 +00:00

io.py

Issue #6939: Fix file I/O objects in the io module to keep the original

2010-01-27 21:48:46 +00:00

keyword.py

…

linecache.py

Merged revisions 72319-72320,72467,72661,72675-72679,72703,72708,72710,72712,72801-72802,72820,72822,72824,72826-72828,72830 via svnmerge from

2009-05-26 09:04:23 +00:00

locale.py

Merged revisions 72399 via svnmerge from

2009-05-06 13:21:17 +00:00

macpath.py

Merged revisions 78247 via svnmerge from

2010-02-20 09:16:04 +00:00

macurl2path.py

…

mailbox.py

Merged revisions 71046 via svnmerge from

2009-04-02 14:09:49 +00:00

mailcap.py

…

markupbase.py

…

md5.py

…

mhlib.py

…

mimetools.py

warnings.catch_warnings() now returns a list or None instead of the custom

2008-09-09 00:49:16 +00:00

mimetypes.py

Merged revisions 72045 via svnmerge from

2009-04-27 21:01:13 +00:00

MimeWriter.py

…

mimify.py

…

modulefinder.py

Merged revisions 67046 via svnmerge from

2008-10-30 20:29:54 +00:00

multifile.py

…

mutex.py

…

netrc.py

…

new.py

…

nntplib.py

Merged revisions 72640 via svnmerge from

2009-05-14 21:27:08 +00:00

ntpath.py

Merged revisions 78247 via svnmerge from

2010-02-20 09:16:04 +00:00

nturl2path.py

merge r72343. Fix for issue7043

2009-10-05 04:13:01 +00:00

numbers.py

Merged revisions 68813,69546 via svnmerge from

2009-02-12 18:05:07 +00:00

opcode.py

…

optparse.py

Merged revisions 69846 via svnmerge from

2009-07-02 15:37:21 +00:00

os2emxpath.py

Merged revisions 78247 via svnmerge from

2010-02-20 09:16:04 +00:00

os.py

Merged revisions 77879 via svnmerge from

2010-01-31 16:47:55 +00:00

pdb.doc

…

pdb.py

Merged revisions 73206,73232,73299,73683,74020,74185,74544,74643,74647,74817,74838-74839,74865,74946,75402,75459,75604,75696 via svnmerge from

2009-10-27 15:39:53 +00:00

pickle.py

Remove use of callable() from pickle to silence warnings under -3.

2008-08-04 21:34:34 +00:00

pickletools.py

Merged revisions 72792 via svnmerge from

2009-05-20 19:05:16 +00:00

pipes.py

Merged revisions 78339 via svnmerge from

2010-02-22 22:31:00 +00:00

pkgutil.py

…

platform.py

Merged revisions 78056 via svnmerge from

2010-02-07 11:30:54 +00:00

plistlib.py

Merged revisions 72458 via svnmerge from

2009-05-08 02:47:02 +00:00

popen2.py

…

poplib.py

…

posixfile.py

…

posixpath.py

Merged revisions 78247 via svnmerge from

2010-02-20 09:16:04 +00:00

pprint.py

…

profile.py

Merged revisions 74773 via svnmerge from

2009-09-13 15:12:47 +00:00

pstats.py

Silence -3 warnings in pstats: a dict.has_key() usage and backport solution to

2008-08-03 22:52:42 +00:00

pty.py

…

py_compile.py

…

pyclbr.py

…

pydoc_topics.py

bumping to 2.6.4

2009-10-26 01:48:07 +00:00

pydoc.py

Merged revisions 78207 via svnmerge from

2010-02-16 23:29:44 +00:00

Queue.py

…

quopri.py

…

random.py

Issue 6261: Clarify behavior of random.uniform().

2009-06-11 23:18:54 +00:00

re.py

Merged revisions 67952-67953,67955,67957-67958,67960-67961,67963,67965,67967,67970-67971,67973,67982,67988,67990,67995,68014,68016,68030,68057,68061,68112,68115-68118,68120-68121,68123-68128 via svnmerge from

2009-01-01 15:46:10 +00:00

repr.py

…

rexec.py

…

rfc822.py

…

rlcompleter.py

Remove a use of callable() to silence the warning triggered under -3.

2008-08-01 01:45:49 +00:00

robotparser.py

…

runpy.py

Merged revisions 67750-67751 via svnmerge from

2008-12-14 11:30:16 +00:00

sched.py

Merged revisions 72932 via svnmerge from

2009-05-26 07:50:52 +00:00

sets.py

…

sgmllib.py

Merged revisions 70906 via svnmerge from

2009-04-04 12:51:52 +00:00

sha.py

…

shelve.py

Merged revisions 78141-78142 via svnmerge from

2010-02-11 02:01:02 +00:00

shlex.py

…

shutil.py

Merged revisions 69100 via svnmerge from

2009-01-29 20:30:51 +00:00

SimpleHTTPServer.py

…

SimpleXMLRPCServer.py

Merged revisions 71268 via svnmerge from

2009-04-05 21:34:15 +00:00

site.py

…

smtpd.py

Merged revisions 69846 via svnmerge from

2009-07-02 15:37:21 +00:00

smtplib.py

Merged revisions 72835 via svnmerge from

2009-05-23 01:42:42 +00:00

sndhdr.py

…

socket.py

Merged revisions 73145 via svnmerge from

2009-08-15 06:40:49 +00:00

SocketServer.py

Merged revisions 69927 via svnmerge from

2009-07-07 13:04:54 +00:00

sre_compile.py

…

sre_constants.py

…

sre_parse.py

…

sre.py

…

ssl.py

Merged revisions 77595 via svnmerge from

2010-01-18 09:12:06 +00:00

stat.py

…

statvfs.py

…

string.py

Merged revisions 75070 via svnmerge from

2009-09-26 11:23:16 +00:00

StringIO.py

Merged revisions 76798-76799 via svnmerge from

2009-12-13 17:34:05 +00:00

stringold.py

…

stringprep.py

…

struct.py

Merged revisions 75283 via svnmerge from

2009-10-27 17:00:03 +00:00

subprocess.py

Merged revisions 76168 via svnmerge from

2009-11-09 15:20:16 +00:00

sunau.py

…

sunaudio.py

…

symbol.py

…

symtable.py

Merged revisions 70801,70809 via svnmerge from

2009-03-31 14:30:05 +00:00

tabnanny.py

…

tarfile.py

Merged revisions 76381 via svnmerge from

2009-11-18 21:09:35 +00:00

telnetlib.py

…

tempfile.py

…

textwrap.py

Merged revisions 67952-67953,67955,67957-67958,67960-67961,67963,67965,67967,67970-67971,67973,67982,67988,67990,67995,68014,68016,68030,68057,68061,68112,68115-68118,68120-68121,68123-68128 via svnmerge from

2009-01-01 15:46:10 +00:00

this.py

…

threading.py

Merged revisions 76137,76172 via svnmerge from

2009-11-09 16:47:50 +00:00

timeit.py

Localize the function lookup in timeit.

2009-04-03 02:47:57 +00:00

toaiff.py

…

token.py

…

tokenize.py

Remove a tuple unpacking in a parameter list to remove a SyntaxWarning raised

2008-08-02 03:15:20 +00:00

trace.py

…

traceback.py

Merged revisions 73206,73232,73299,73683,74020,74185,74544,74643,74647,74817,74838-74839,74865,74946,75402,75459,75604,75696 via svnmerge from

2009-10-27 15:39:53 +00:00

tty.py

…

types.py

…

unittest.py

Move initialising unittest.TestProgram.testRunner into runTests. Issue 6418.

2009-07-13 16:32:47 +00:00

urllib2.py

Merged revisions 78431 via svnmerge from

2010-02-24 20:58:58 +00:00

urllib.py

Merged revisions 78268 via svnmerge from

2010-02-20 22:13:01 +00:00

urlparse.py

Merged revisions 78234 via svnmerge from

2010-02-19 07:39:41 +00:00

user.py

…

UserDict.py

revert r77790. it requires a new-style class change

2010-01-28 01:31:13 +00:00

UserList.py

Issue 2235: Py3k warnings are now emitted for classes that will no longer inherit a__hash__ implementation from a parent class in Python 3.x. The standard library and test suite have been updated to not emit these warnings.

2008-08-11 15:45:58 +00:00

UserString.py

…

uu.py

…

uuid.py

Merged revisions 67318 via svnmerge from

2008-11-21 22:08:14 +00:00

warnings.py

Issue #3781: Final cleanup of warnings.catch_warnings and its usage in the test suite. Closes issue w.r.t. 2.6 (R: Brett Cannon)

2008-09-11 12:11:06 +00:00

wave.py

…

weakref.py

Update __all__ for cookielib, csv, os, and urllib2 for objects imported into

2008-08-18 00:46:22 +00:00

webbrowser.py

Merged revisions 73206,73232,73299,73683,74020,74185,74544,74643,74647,74817,74838-74839,74865,74946,75402,75459,75604,75696 via svnmerge from

2009-10-27 15:39:53 +00:00

whichdb.py

…

wsgiref.egg-info

…

xdrlib.py

…

xmllib.py

Merged revisions 72458 via svnmerge from

2009-05-08 02:47:02 +00:00

xmlrpclib.py

Remove assignment to True/False and use of dict.has_key() to silence warnings

2008-08-04 00:50:11 +00:00

zipfile.py

Merged revisions 74245 via svnmerge from

2010-01-06 20:08:02 +00:00