Benjamin Peterson aea4428fdc Merged revisions 77292-77293 via svnmerge from ...

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

........
  r77292 | benjamin.peterson | 2010-01-03 18:43:01 -0600 (Sun, 03 Jan 2010) | 1 line

  do correct lookup of the __complex__ method
........
  r77293 | benjamin.peterson | 2010-01-03 19:00:47 -0600 (Sun, 03 Jan 2010) | 1 line

  factor out __complex__ lookup code to fix another case
........

2010-01-04 01:10:28 +00:00

..

ctypes

Changed try/finally to contextlib.closing, as discussed in issue 6882.

2009-10-23 12:56:11 +00:00

curses

…

dbm

Redundancy isn't needed here.

2009-10-10 21:28:29 +00:00

distutils

Fix merge issue where I forgot to replace sys.maxint by sys.maxsize.

2009-12-26 13:16:15 +00:00

email

Add mktime_tz to __all__. It's documented as being available in email.utils.

2009-11-25 18:45:15 +00:00

encodings

Fix a minor grammatical error.

2009-12-13 21:25:28 +00:00

html

…

http

Merged revisions 77263-77264 via svnmerge from

2010-01-03 03:28:29 +00:00

idlelib

Merged revisions 77031 via svnmerge from

2009-12-24 14:03:19 +00:00

importlib

Clarify importlib.abc.PyPycLoader.write_bytecode().

2009-12-12 22:35:59 +00:00

json

Merged revisions 76708 via svnmerge from

2009-12-08 15:57:31 +00:00

lib2to3

Merged revisions 77160 via svnmerge from

2009-12-30 19:52:54 +00:00

logging

logging: Improved support for SMTP over TLS.

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

msilib

Merged revisions 73390 via svnmerge from

2009-06-12 17:31:41 +00:00

multiprocessing

Merged revisions 76245 via svnmerge from

2009-11-13 22:35:18 +00:00

plat-aix4

…

plat-darwin

These are present in the trunk but no longer in 3.x, which causes problems

2009-03-04 23:21:07 +00:00

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

update pydoc-topics

2009-06-26 13:05:03 +00:00

site-packages

…

sqlite3

Merged revisions 74754 via svnmerge from

2009-09-12 18:41:20 +00:00

test

Merged revisions 77292-77293 via svnmerge from

2010-01-04 01:10:28 +00:00

tkinter

Merged revisions 74507-74511,74517 via svnmerge from

2009-08-18 15:35:57 +00:00

unittest

Merged revisions 76052,76522,76591,76689,76697,76733 via svnmerge from

2009-12-13 02:10:36 +00:00

urllib

Merged revisions 77058 via svnmerge from

2009-12-27 10:13:39 +00:00

wsgiref

Use true booleans and PEP8 for argdefaults.

2009-09-16 15:54:04 +00:00

xml

Merged revisions 75149,75260-75263,75265-75267,75292,75300,75376,75405,75429-75433,75437,75445,75501,75551,75572,75589-75591,75657,75742,75868,75952-75957,76057,76105,76139,76143,76162,76223 via svnmerge from

2009-11-13 02:25:08 +00:00

xmlrpc

Merged revisions 74558 via svnmerge from

2009-12-16 10:50:44 +00:00

__future__.py

barry has already been causing test breakage

2009-04-01 20:38:13 +00:00

__phello__.foo.py

…

_abcoll.py

Issue 6037: MutableSequence.__iadd__ should return self.

2009-05-18 15:35:26 +00:00

_compat_pickle.py

Issue #6137: The pickle module now translates module names when loading

2009-06-04 20:32:06 +00:00

_dummy_thread.py

…

_markupbase.py

…

_pyio.py

Merged revisions 76896,76898 via svnmerge from

2009-12-19 21:08:31 +00:00

_strptime.py

The message for the exception when time.strptime was passed something other

2009-03-31 03:58:04 +00:00

_threading_local.py

Merged revisions 76117 via svnmerge from

2009-11-05 13:49:14 +00:00

_weakrefset.py

Issue 5964: Fixed WeakSet __eq__ comparison to handle non-WeakSet objects.

2009-05-17 17:32:20 +00:00

abc.py

Merged revisions 72278 via svnmerge from

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

aifc.py

Merged revisions 72425-72426 via svnmerge from

2009-05-07 18:24:38 +00:00

antigravity.py

Another hidden treasure.

2009-06-03 17:21:17 +00:00

ast.py

Merged revisions 68450,68480-68481,68493,68495,68501,68512,68514-68515,68534-68536,68552,68563,68570-68572,68575,68582,68596,68623-68624,68628 via svnmerge from

2009-01-16 03:54:08 +00:00

asynchat.py

…

asyncore.py

This fixes bug 5798 on OS X.

2009-06-03 19:48:02 +00:00

base64.py

Make b64encode raises properly a TypeError when altchars is not bytes.

2009-06-29 01:13:41 +00:00

bdb.py

Merged revisions 72322 via svnmerge from

2009-05-05 09:00:19 +00:00

binhex.py

Issues #2715, #6621: Remove unused and undefined references to FSSpec

2009-08-02 20:08:54 +00:00

bisect.py

Per the language summit, the optional fastpath imports should use from-import-star.

2009-03-31 17:51:51 +00:00

build_class.py

…

calendar.py

…

cgi.py

#4351: more appropriate DeprecationWarning stacklevels

2009-05-08 03:57:12 +00:00

cgitb.py

Merged revisions 70980,71059,71225,71234,71241,71243,71249,71251,71255,71266,71299,71329,71397-71398,71486 via svnmerge from

2009-04-11 19:48:14 +00:00

chunk.py

…

cmd.py

…

code.py

Merged revisions 75264,75268,75293,75318,75391-75392,75436,75478,75971,76003,76058,76140-76141,76231,76380,76428-76429 via svnmerge from

2009-11-25 17:46:26 +00:00

codecs.py

…

codeop.py

correct porting error with raise #7161

2009-10-18 00:32:49 +00:00

collections.py

Merged revisions 77241 via svnmerge from

2010-01-02 21:40:36 +00:00

colorsys.py

Merged revisions 68884,68973,68978,69003,69083,69112-69113 via svnmerge from

2009-01-30 03:39:35 +00:00

compileall.py

Merged revisions 71750 via svnmerge from

2009-04-19 17:14:11 +00:00

configparser.py

Merged revisions 71564 via svnmerge from

2009-04-27 16:43:36 +00:00

contextlib.py

remove nested from __all__

2009-07-01 01:38:23 +00:00

copy.py

Merged revisions 76571 via svnmerge from

2009-11-28 15:58:27 +00:00

copyreg.py

…

cProfile.py

Remove the just-removed "help" from __all__.

2009-09-04 17:15:16 +00:00

csv.py

Merged revisions 74779-74786,74793,74795,74811,74860-74861,74863,74876,74886,74896,74901,74903,74908,74912,74930,74933,74943,74946,74952-74955,75015,75019,75032,75068,75076,75095,75098,75102,75129,75139,75230 via svnmerge from

2009-10-04 14:49:41 +00:00

decimal.py

Merged revisions 75943-75945 via svnmerge from

2009-10-29 12:23:02 +00:00

difflib.py

Merged revisions 76464 via svnmerge from

2009-11-23 19:02:52 +00:00

dis.py

Merged revisions 68116-68119,68121,68123-68127 via svnmerge from

2009-01-01 15:05:06 +00:00

doctest.py

Merged revisions 76973 via svnmerge from

2009-12-21 12:50:02 +00:00

dummy_threading.py

…

filecmp.py

Use new form of with-statement instead of contextlib.nested().

2009-06-04 00:11:54 +00:00

fileinput.py

Use PEP 8 and true booleans.

2009-05-17 12:22:57 +00:00

fnmatch.py

Merged revisions 74475 via svnmerge from

2009-08-16 18:58:46 +00:00

formatter.py

Fix formatter usage of filter(). Bug #3800.

2008-09-09 19:31:25 +00:00

fractions.py

Merged revisions 76456 via svnmerge from

2009-11-23 16:27:17 +00:00

ftplib.py

Merged revisions 76546 via svnmerge from

2009-11-27 13:23:26 +00:00

functools.py

…

genericpath.py

Issue #3187: Better support for "undecodable" filenames. Code by Victor

2008-10-02 18:55:37 +00:00

getopt.py

Merged revisions 67463,67572,67576,67628 via svnmerge from

2008-12-07 15:15:22 +00:00

getpass.py

Merged revisions 76000,76016 via svnmerge from

2009-11-01 18:42:17 +00:00

gettext.py

Merged revisions 72506,72525-72526,72551,72558,72616,72654-72655,72689,72745,72750,72802,72812,72822,72824,72826-72827,72833,72876,72890,72923,72946,73026,73042,73045,73047,73065,73068-73069 via svnmerge from

2009-06-01 22:42:33 +00:00

glob.py

Merged revisions 70712,70714,70764-70765,70769-70771,70773,70776-70777,70788-70789,70824,70828,70832,70836,70842,70851,70855,70857,70866-70872,70883,70885,70893-70894,70896-70897,70903,70905-70907,70915,70927,70933,70951,70960,70962-70964,70998,71001,71006,71008,71010-71011,71019,71037,71056,71094,71101-71103,71106,71119,71123,71149-71150,71203,71212,71214-71217,71221,71240 via svnmerge from

2009-04-05 19:13:16 +00:00

gzip.py

Merged revisions 77288 via svnmerge from

2010-01-03 22:37:40 +00:00

hashlib.py

Merged revisions 74479 via svnmerge from

2009-08-16 22:08:56 +00:00

heapq.py

Make life easier for non-CPython implementations

2009-03-29 19:30:50 +00:00

hmac.py

…

imaplib.py

Merged revisions 77041 via svnmerge from

2009-12-24 16:12:49 +00:00

imghdr.py

…

inspect.py

Merged revisions 75149,75260-75263,75265-75267,75292,75300,75376,75405,75429-75433,75437,75445,75501,75551,75572,75589-75591,75657,75742,75868,75952-75957,76057,76105,76139,76143,76162,76223 via svnmerge from

2009-11-13 02:25:08 +00:00

io.py

add myself

2009-05-01 20:45:43 +00:00

keyword.py

…

linecache.py

Merged revisions 72319-72320 via svnmerge from

2009-05-05 08:31:54 +00:00

locale.py

Issue #7080: locale.strxfrm() raises a MemoryError on 64-bit non-Windows

2009-10-19 19:43:09 +00:00

macpath.py

Issue3187 for Macintosh platform:

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

macurl2path.py

Fixing Issue6711 - macurl2path has typos that raise AttributeError

2009-08-16 06:43:50 +00:00

mailbox.py

Merged revisions 75264,75268,75293,75318,75391-75392,75436,75478,75971,76003,76058,76140-76141,76231,76380,76428-76429 via svnmerge from

2009-11-25 17:46:26 +00:00

mailcap.py

…

mimetypes.py

Merged revisions 76306 via svnmerge from

2009-11-15 14:25:16 +00:00

modulefinder.py

no 2.3 compat in the py3k lib #3676

2009-02-16 16:20:10 +00:00

netrc.py

…

nntplib.py

Merged revisions 72640 via svnmerge from

2009-05-14 21:30:46 +00:00

ntpath.py

PendingDeprecationWarning -> DeprecationWarning. Both of these were

2009-06-30 05:33:50 +00:00

nturl2path.py

Fix for issue1153027, making Py3k changes similar to fix in issue918368.

2009-05-05 18:41:13 +00:00

numbers.py

Issue 4998: restore utility of __slots__ on Fraction.

2009-02-12 17:58:36 +00:00

opcode.py

Merged revisions 72912,72920,72940 via svnmerge from

2009-06-28 03:18:59 +00:00

optparse.py

Merged revisions 71540,71563 via svnmerge from

2009-04-27 16:41:41 +00:00

os2emxpath.py

…

os.py

Issue #7461: objects returned by os.popen() should support the context manager protocol

2009-12-09 00:01:27 +00:00

pdb.doc

…

pdb.py

Merged revisions 74838-74839 via svnmerge from

2009-09-16 16:40:45 +00:00

pickle.py

Issue #6137: The pickle module now translates module names when loading

2009-06-04 20:32:06 +00:00

pickletools.py

Issue #6137: The pickle module now translates module names when loading

2009-06-04 20:32:06 +00:00

pipes.py

…

pkgutil.py

Issue 4005: Remove .sort() call on dict_keys object.

2009-07-05 06:42:44 +00:00

platform.py

Merged revisions 74779-74786,74793,74795,74811,74860-74861,74863,74876,74886,74896,74901,74903,74908,74912,74930,74933,74943,74946,74952-74955,75015,75019,75032,75068,75076,75095,75098,75102,75129,75139,75230 via svnmerge from

2009-10-04 14:49:41 +00:00

plistlib.py

updated the doc to match the module docstring, fixed a couple of errors in the doc markup and in the module

2009-09-16 00:49:03 +00:00

poplib.py

Issue #6622: Fix 'variable referenced before assignment' bug in POP3.apop.

2009-08-06 16:06:25 +00:00

posixpath.py

Merged revisions 70980,71059,71225,71234,71241,71243,71249,71251,71255,71266,71299,71329,71397-71398,71486 via svnmerge from

2009-04-11 19:48:14 +00:00

pprint.py

Issue 3976: fix pprint for sets, frozensets, and dicts containing unorderable types.

2009-11-19 01:07:05 +00:00

profile.py

Merged revisions 74773 via svnmerge from

2009-09-13 15:18:53 +00:00

pstats.py

Use true kwonly arg instead of **kwds hackaround.

2009-09-02 20:33:30 +00:00

pty.py

Issue #3782: os.write() must not accept unicode strings

2008-09-15 23:02:56 +00:00

py_compile.py

…

pyclbr.py

…

pydoc.py

Merged revisions 76312 via svnmerge from

2009-11-15 23:04:33 +00:00

queue.py

port the queue change r70405

2009-03-21 17:36:10 +00:00

quopri.py

Use true booleans and a bit more PEP8.

2009-09-02 20:34:14 +00:00

random.py

Issue #7435: Remove duplicate int/long tests, and other

2009-12-05 20:28:34 +00:00

re.py

Merged revisions 70090 via svnmerge from

2009-03-02 05:21:55 +00:00

reprlib.py

…

rlcompleter.py

…

runpy.py

Merged revisions 76934-76935 via svnmerge from

2009-12-20 17:28:31 +00:00

sched.py

Merged revisions 72932 via svnmerge from

2009-05-26 07:51:03 +00:00

shelve.py

The default shelve pickle protocol should have been 3.

2009-02-03 04:19:10 +00:00

shlex.py

…

shutil.py

Merged revisions 73250 via svnmerge from

2009-06-05 19:13:27 +00:00

site.py

Merged revisions 74526 via svnmerge from

2009-08-20 21:28:05 +00:00

smtpd.py

Merged revisions 69846 via svnmerge from

2009-02-21 20:59:32 +00:00

smtplib.py

fix print statement

2009-09-25 21:35:24 +00:00

sndhdr.py

…

socket.py

Merged revisions 77263-77264 via svnmerge from

2010-01-03 03:28:29 +00:00

socketserver.py

http://bugs.python.org/issue6382

2009-07-07 09:09:10 +00:00

sre_compile.py

Merged revisions 66894 via svnmerge from

2008-10-14 23:07:40 +00:00

sre_constants.py

…

sre_parse.py

Merged revisions 66894 via svnmerge from

2008-10-14 23:07:40 +00:00

ssl.py

More codestring -> codebytes.

2009-06-04 09:42:55 +00:00

stat.py

…

string.py

Merged revisions 75070 via svnmerge from

2009-09-26 12:33:22 +00:00

stringprep.py

…

struct.py

Merged revisions 75283 via svnmerge from

2009-10-08 15:59:20 +00:00

subprocess.py

Recorded merge of revisions 77086 via svnmerge from

2009-12-28 08:10:38 +00:00

sunau.py

…

symbol.py

fix an ambiguity in the grammar from the implementation of extended unpacking

2009-09-27 02:43:28 +00:00

symtable.py

simplify this expression

2009-06-28 19:30:36 +00:00

tabnanny.py

…

tarfile.py

Issue #4757: zlib.compress and other methods in the zlib module now

2009-12-14 18:00:06 +00:00

telnetlib.py

- fix issue #6106, Telnet.process_rawq default handling of WILL/WONT/DO/DONT

2009-07-26 22:23:04 +00:00

tempfile.py

#6077: on Windows, fix truncation of a tempfile.TemporaryFile opened in "wt+" mode:

2009-11-30 00:08:56 +00:00

textwrap.py

Merged revisions 74779-74786,74793,74795,74811,74860-74861,74863,74876,74886,74896,74901,74903,74908,74912,74930,74933,74943,74946,74952-74955,75015,75019,75032,75068,75076,75095,75098,75102,75129,75139,75230 via svnmerge from

2009-10-04 14:49:41 +00:00

this.py

…

threading.py

Issue #3001: Add a C implementation of recursive locks which is used by

2009-11-10 18:46:01 +00:00

timeit.py

Localize the function lookup in timeit.

2009-04-03 02:45:36 +00:00

token.py

…

tokenize.py

use some more itertools magic to make '' be yielded after readline is done

2009-11-14 18:09:17 +00:00

trace.py

#5656: detect correct encoding of files when reporting coverage in trace.py, and ignore files in the temporary directory when reporting.

2009-04-01 23:07:29 +00:00

traceback.py

Issue #4486: When an exception has an explicit cause, do not print its implicit context too.

2009-11-28 16:12:28 +00:00

tty.py

…

turtle.py

#7129: add missing function.

2009-10-14 18:46:15 +00:00

types.py

…

uu.py

Use true booleans and PEP8 for argdefaults.

2009-09-16 15:54:04 +00:00

uuid.py

#7380: Fix some str/bytearray/bytes issues in uuid docs and implementation.

2009-12-19 18:23:28 +00:00

warnings.py

Merged revisions 75365,75394,75402-75403,75418,75459,75484,75592-75596,75600,75602-75607,75610-75613,75616-75617,75623,75627,75640,75647,75696,75795 via svnmerge from

2009-10-27 15:28:25 +00:00

wave.py

…

weakref.py

Issue #6149: Fix initialization of WeakValueDictionary objects from non-empty parameters.

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

webbrowser.py

Merged revisions 74277,74321,74323,74326,74355,74465,74467,74488,74492,74513,74531,74549,74553,74625,74632,74643-74644,74647,74652,74666,74671,74727,74739 via svnmerge from

2009-09-11 22:24:02 +00:00

wsgiref.egg-info

…

xdrlib.py

…

zipfile.py

Merged revisions 77136 via svnmerge from

2009-12-30 12:34:59 +00:00