R. David Murray 05afa1aefd Merged revisions 72299 via svnmerge from ...

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

........
  r72299 | r.david.murray | 2009-05-04 18:16:24 -0400 (Mon, 04 May 2009) | 7 lines

  Fix issue 5890: (property subclass shadows __doc__ string) by inserting
  the __doc__ into the subclass instance __dict__.  The fix refactors
  property_copy to call property_init in such a way that the __doc__
  logic is re-executed correctly when getter_doc is 1, thus simplifying
  property_copy.
........

2009-05-05 00:52:14 +00:00

..

bsddb

Merged revisions 68978 via svnmerge from

2009-01-26 21:53:32 +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 71847 via svnmerge from

2009-04-24 20:18:22 +00:00

curses

Issue #3239. Differentiate the ascii call from the curses one and

2008-07-05 20:39:59 +00:00

distutils

Merged revisions 71884 via svnmerge from

2009-04-25 12:55:56 +00:00

email

#2676: email/message.py [Message.get_content_type]: Trivial regex hangs on pathological input

2008-08-15 21:03:21 +00:00

encodings

…

hotshot

Added warning for the removal of 'hotshot' in Py3k.

2008-03-22 04:08:44 +00:00

idlelib

Merged revisions 70723 via svnmerge from

2009-04-25 18:18:54 +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 68288-68291,68325-68326,68338,68388,68393,68423 via svnmerge from

2009-01-09 03:04:01 +00:00

lib-tk

Merged revisions 72278 via svnmerge from

2009-05-04 16:06:12 +00:00

logging

Issue #5854: Updated __all__ to include some missing names and remove some names which should not be exported.

2009-04-27 13:51:32 +00:00

msilib

Issue #3732: Backported r53335 to supress deprecation warning.

2008-09-01 14:24:04 +00:00

multiprocessing

Merged revisions 68915 via svnmerge from

2009-03-31 15:01:45 +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

Deprecate WAIT for removal in 3.0.

2008-05-15 04:17:35 +00:00

plat-irix6

Deprecate WAIT for removal in 3.0.

2008-05-15 04:17:35 +00:00

plat-linux2

…

plat-mac

Merged revisions 68133-68134,68141-68142,68145-68146,68148-68149,68159-68162,68166,68171-68174,68179,68195-68196,68210,68214-68215,68217-68222 via svnmerge from

2009-01-03 21:55:17 +00:00

plat-netbsd1

…

plat-next3

…

plat-os2emx

#2503 make singletons compared with "is" not == or !=

2008-03-29 15:24:25 +00:00

plat-riscos

Patch #2167 from calvin: Remove unused imports

2008-02-23 17:40:11 +00:00

plat-sunos5

Deprecate sunaudiodev/SUNAUDIODEV for removal in 3.0.

2008-05-16 00:10:24 +00:00

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 72299 via svnmerge from

2009-05-05 00:52:14 +00:00

wsgiref

Silence warnings under -3 triggered by wsgiref.

2008-08-04 21:30:53 +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

Patch #2477: Added from __future__ import unicode_literals

2008-03-26 22:01:37 +00:00

__phello__.foo.py

…

_abcoll.py

Issue #5647: MutableSet.__iand__() no longer mutates self during iteration.

2009-04-01 18:55:57 +00:00

_LWPCookieJar.py

…

_MozillaCookieJar.py

…

_strptime.py

add %f format to datetime - issue 1158

2008-03-15 16:04:45 +00:00

_threading_local.py

give the threading API PEP 8 names

2008-06-11 17:27:50 +00:00

abc.py

Merged revisions 72278 via svnmerge from

2009-05-04 16:06:12 +00:00

aifc.py

Merged revisions 72100-72101 via svnmerge from

2009-04-29 14:54:29 +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

Deprecate the audiodev module for 3.0.

2008-05-06 23:23:34 +00:00

base64.py

…

BaseHTTPServer.py

Move test.test_support.catch_warning() to the warnings module, rename it

2008-09-02 01:25:16 +00:00

Bastion.py

Deprecate Bastion and rexec for 3.0.

2008-05-10 02:27:04 +00:00

bdb.py

Merged revisions 67750-67751 via svnmerge from

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

binhex.py

…

bisect.py

Issue 3301: Bisect functions behaved badly when lo was negative.

2008-07-10 14:03:19 +00:00

calendar.py

Remove some from __future__ import with_statements

2008-04-30 21:25:55 +00:00

cgi.py

Merged revisions 67528 via svnmerge from

2008-12-04 19:01:28 +00:00

CGIHTTPServer.py

#3345: fix docstring.

2008-07-16 22:09:17 +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

Merged revisions 61750,61752,61754,61756,61760,61763,61768,61772,61775,61805,61809,61812,61819,61917,61920,61930,61933-61934 via svnmerge from

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

codeop.py

…

collections.py

Issue 5021: doctest.testfile should set __name__

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

colorsys.py

…

commands.py

take Brett's advice on a few warnings

2008-05-26 20:41:45 +00:00

compileall.py

fix typo

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

ConfigParser.py

Merged revisions 71564 via svnmerge from

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

contextlib.py

#1748: use functools.wraps instead of rolling own metadata update.

2008-04-30 21:08:42 +00:00

Cookie.py

#1638033: add support for httponly on Cookie.Morsel

2008-09-06 19:28:11 +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

Revert copy_reg -> copyreg rename.

2008-05-20 07:49:57 +00:00

copy.py

Revert the renaming of repr to reprlib.

2008-05-23 05:03:59 +00:00

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 70430 via svnmerge from

2009-03-17 18:07:41 +00:00

difflib.py

Use functools.reduce() in difflib instead of __builtin__.reduce() to silence

2008-08-09 23:34:11 +00:00

dircache.py

Deprecate the dircache module for 3.0.

2008-05-10 21:12:57 +00:00

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

…

formatter.py

…

fpformat.py

Deprecate the fpformat module for removal in 3.0.

2008-05-10 22:11:45 +00:00

fractions.py

Fractions.from_float() no longer loses precision with large integer inputs.

2009-01-03 09:24:18 +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

Major improvements:

2008-04-22 08:08:41 +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

#2959: allow multiple close() calls for GzipFile.

2008-05-25 08:07:37 +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

Issue 4790: Eliminate unnecessary work from heapq's nlargest() and nsmallest()

2008-12-31 04:18:44 +00:00

hmac.py

silence callable warning in hmac

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

htmlentitydefs.py

revert creation of the html.entities and html.parser modules

2008-05-20 06:08:38 +00:00

htmllib.py

Deprecate htmllib and sgmllib for 3.0.

2008-06-01 21:19:14 +00:00

HTMLParser.py

revert creation of the html.entities and html.parser modules

2008-05-20 06:08:38 +00:00

httplib.py

Merged revisions 70107 via svnmerge from

2009-03-02 22:46:11 +00:00

ihooks.py

Deprecate ihooks for removal in 3.0.

2008-05-10 22:45:07 +00:00

imaplib.py

#1389051: IMAP module tries to read entire message in one chunk. Patch by Fredrik Lundh.

2008-02-23 19:02:33 +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

Deprecate the imputil module for removal in 3.0.

2008-05-08 18:15:14 +00:00

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

io.py

Merged revisions 67898,67904-67907,67912,67918,67920-67921,67923-67924,67927,67930,67932,67943 via svnmerge from

2008-12-27 17:05:29 +00:00

keyword.py

…

linecache.py

Merged revisions 67750-67751 via svnmerge from

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

locale.py

Merged revisions 70457 via svnmerge from

2009-03-18 17:11:06 +00:00

macpath.py

Add Py3k warnings to os.path.walk

2008-05-09 00:27:01 +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

Deprecated the mhlib module for removal in 3.0.

2008-05-11 03:01:47 +00:00

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

Deprecate the multifile module as per PEP 4.

2008-05-12 03:19:20 +00:00

mutex.py

The mutex module has been deprecated for removal in 3.0.

2008-05-08 19:26:08 +00:00

netrc.py

…

new.py

Deprecate the new module for removal in 3.0.

2008-05-09 05:18:40 +00:00

nntplib.py

…

ntpath.py

Add Py3k warnings to os.path.walk

2008-05-09 00:27:01 +00:00

nturl2path.py

…

numbers.py

Merged revisions 68813,69546 via svnmerge from

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

opcode.py

…

optparse.py

Merged revisions 71540,71544,71546,71563,71572,71607,71653 via svnmerge from

2009-04-28 18:16:02 +00:00

os2emxpath.py

…

os.py

Issue #3708: os.urandom no longer goes into an infinite loop when passed a

2008-09-02 05:36:11 +00:00

pdb.doc

Add some sentence endings.

2008-05-11 14:17:13 +00:00

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

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 68903,68906 via svnmerge from

2009-01-24 21:30:14 +00:00

pipes.py

…

pkgutil.py

Issue 2439: add pkgutils.get_data() as a convenience wrapper for the PEP 302 get_data() API (contributed by Paul Moore)

2008-04-15 10:25:31 +00:00

platform.py

Merged revisions 70594-70595 via svnmerge from

2009-03-25 19:52:04 +00:00

plistlib.py

Merged revisions 71058,71149-71150,71212,71214-71216,71222,71225,71234,71237-71238,71240-71241,71243,71249,71251 via svnmerge from

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

popen2.py

Use os.closerange() in popen2.

2008-02-23 22:09:24 +00:00

poplib.py

Fixed the semantic of timeout for socket.create_connection and

2008-05-29 16:39:26 +00:00

posixfile.py

…

posixpath.py

Merged revisions 71058,71149-71150,71212,71214-71216,71222,71225,71234,71237-71238,71240-71241,71243,71249,71251 via svnmerge from

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

pprint.py

Fixed issue #2888. Now the behaviour of pprint when working with nested

2008-06-21 17:43:56 +00:00

profile.py

Remove a dict.has_key() usage in profile to silence a -3 DeprecationWarning.

2008-08-03 22:38:19 +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

#2225: return nonzero status code from py_compile if not all files could be compiled.

2008-03-06 07:41:16 +00:00

pyclbr.py

Minor cleanups:

2008-04-28 02:57:23 +00:00

pydoc_topics.py

Update pydoc topics.

2009-04-28 18:53:13 +00:00

pydoc.py

Merged revisions 71443 via svnmerge from

2009-04-10 12:38:09 +00:00

Queue.py

give the threading API PEP 8 names

2008-06-11 17:27:50 +00:00

quopri.py

…

random.py

Merged revisions 68292,68344,68361,68378,68424,68426,68429-68430,68450,68457,68480-68481,68493,68495,68499,68501,68512,68514-68515 via svnmerge from

2009-01-14 00:00:17 +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

Revert the renaming of repr to reprlib.

2008-05-23 05:03:59 +00:00

rexec.py

Deprecate Bastion and rexec for 3.0.

2008-05-10 02:27:04 +00:00

rfc822.py

fix test_py3kwarns

2008-07-14 17:42:17 +00:00

rlcompleter.py

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

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

robotparser.py

Close issue 3437 - missing state change when Allow lines are processed.

2008-07-27 00:49:02 +00:00

runpy.py

Merged revisions 67750-67751 via svnmerge from

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

sched.py

#2803: fix wrong invocation of heappush in seldom-reached code.

2008-05-11 15:20:16 +00:00

sets.py

Issue 2235: __hash__ is once again inherited by default, but inheritance can be blocked explicitly so that collections.Hashable remains meaningful

2008-07-15 14:27:37 +00:00

sgmllib.py

Merged revisions 70906 via svnmerge from

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

sha.py

…

shelve.py

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

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

shlex.py

…

shutil.py

Merged revisions 69100 via svnmerge from

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

SimpleHTTPServer.py

Issue839496: SimpleHTTPServer should open all files in binary mode.

2008-07-06 21:34:39 +00:00

SimpleXMLRPCServer.py

Merged revisions 71268 via svnmerge from

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

site.py

Docstring typo

2008-05-10 17:36:24 +00:00

smtpd.py

…

smtplib.py

Fixed the semantic of timeout for socket.create_connection and

2008-05-29 16:39:26 +00:00

sndhdr.py

…

socket.py

Merged revisions 71329 via svnmerge from

2009-04-06 22:11:57 +00:00

SocketServer.py

socketserver renaming reversal part 3: move the module into the right

2008-05-24 18:31:28 +00:00

sre_compile.py

Issue2564: Prevent a hang in "import test.autotest", which runs the entire test

2008-04-08 21:27:42 +00:00

sre_constants.py

…

sre_parse.py

remove some __getslice__

2008-05-27 01:18:39 +00:00

sre.py

…

ssl.py

fix for release blocker 3910, 2.6 regression in socket.ssl method

2008-09-29 18:56:38 +00:00

stat.py

#2383: remove obsolete XXX comment in stat.py.

2008-03-20 07:25:55 +00:00

statvfs.py

Deprecated statvfs for removal in 3.0.

2008-05-16 00:50:02 +00:00

string.py

Merged revisions 67154,67157-67159,67162-67163,67166,67175-67176,67189,67224-67225,67243 via svnmerge from

2008-12-05 08:35:09 +00:00

StringIO.py

…

stringold.py

Replace all map(None, a) with list(a).

2008-07-18 19:06:13 +00:00

stringprep.py

…

struct.py

…

subprocess.py

Merged revisions 70137 via svnmerge from

2009-03-03 22:55:00 +00:00

sunau.py

…

sunaudio.py

Deprecate the sunaudio module for removal in Python 3.0. The sunau module can provide similar functionality.

2008-07-18 19:30:22 +00:00

symbol.py

Patch #1759: Backport of PEP 3129 class decorators

2008-02-23 15:01:05 +00:00

symtable.py

Merged revisions 70801,70809 via svnmerge from

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

tabnanny.py

…

tarfile.py

Avoid EOFError being passed to the caller (restoring the

2009-03-22 21:29:48 +00:00

telnetlib.py

Fixed the semantic of timeout for socket.create_connection and

2008-05-29 16:39:26 +00:00

tempfile.py

Remove references to platform 'mac'

2008-05-12 11:24:33 +00:00

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 70897 via svnmerge from

2009-03-31 21:40:18 +00:00

timeit.py

Localize the function lookup in timeit.

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

toaiff.py

Deprecate the toaiff module for removal in 3.0.

2008-05-09 05:32:42 +00:00

token.py

Issue 2117. Update compiler module to handle class decorators.

2008-02-25 18:06:00 +00:00

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

Add a timing flag to Trace so you can see where slowness occurs

2008-02-26 08:21:28 +00:00

traceback.py

Rolled back revisions 71237 via svnmerge from

2009-04-07 14:33:53 +00:00

tty.py

…

types.py

Issue 2408: remove the _types module

2008-04-08 22:07:05 +00:00

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

urllib2.py

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

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

urllib.py

Merged revisions 70521 via svnmerge from

2009-03-22 17:49:21 +00:00

urlparse.py

Issue 600362: Relocated parse_qs() and parse_qsl(), from the cgi module

2008-09-03 22:35:50 +00:00

user.py

Deprecate the user module for removal in 3.0.

2008-05-08 20:36:09 +00:00

UserDict.py

Register IterableUserDict as a MutableMapping.

2008-06-07 16:16:12 +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

Issue 2235: __hash__ is once again inherited by default, but inheritance can be blocked explicitly so that collections.Hashable remains meaningful

2008-07-15 14:27:37 +00:00

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

…

whichdb.py

…

wsgiref.egg-info

…

xdrlib.py

…

xmllib.py

…

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 72295 via svnmerge from

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