R. David Murray 27c1914c1b Merged revisions 87415 via svnmerge from ...

svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r87415 | r.david.murray | 2010-12-21 13:07:59 -0500 (Tue, 21 Dec 2010) | 4 lines

  Fix the change made for issue 1243654.

  Surprisingly, it turns out there was no test that exercised this code path.
........

2010-12-21 18:11:01 +00:00

..

ctypes

Merged revisions 86596 via svnmerge from

2010-11-21 01:30:29 +00:00

curses

Merged revisions 82805-82806,83523-83527,83536,83538,83542,83546-83548,83550-83555,83558,83560 via svnmerge from

2010-10-06 08:26:09 +00:00

dbm

Backporting since it would have helped us find a regression.

2009-10-27 13:08:37 +00:00

distutils

Merged revisions 87280 via svnmerge from

2010-12-15 21:12:12 +00:00

email

Merged revisions 87415 via svnmerge from

2010-12-21 18:11:01 +00:00

encodings

Merged revisions 81474 via svnmerge from

2010-05-22 17:01:13 +00:00

html

Merged revisions 81504 via svnmerge from

2010-05-24 21:48:07 +00:00

http

Merged revisions 87373,87381 via svnmerge from

2010-12-18 18:04:38 +00:00

idlelib

Merged revisions 87374 via svnmerge from

2010-12-18 17:21:30 +00:00

importlib

Merged revisions 86596 via svnmerge from

2010-11-21 01:30:29 +00:00

json

Merged revisions 85530,85532-85534,85538-85543,85546-85548 via svnmerge from

2010-11-26 08:42:45 +00:00

lib2to3

Merged revisions 87002 via svnmerge from

2010-12-04 02:24:43 +00:00

logging

Merged revisions 86019 via svnmerge from

2010-10-31 04:42:40 +00:00

msilib

…

multiprocessing

Merged revisions 87225 via svnmerge from

2010-12-14 01:41:07 +00:00

plat-aix4

…

plat-atheos

…

plat-darwin

…

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

…

site-packages

…

sqlite3

Merged revisions 86596 via svnmerge from

2010-11-21 01:30:29 +00:00

test

Merged revisions 87373,87381 via svnmerge from

2010-12-18 18:04:38 +00:00

tkinter

Merged revisions 86697 via svnmerge from

2010-11-22 19:45:06 +00:00

urllib

Merged revisions 87329 via svnmerge from

2010-12-17 04:54:43 +00:00

wsgiref

Manually copy patch for bug 7250 from the release26-maint branch. I suck

2010-03-01 21:56:18 +00:00

xml

Merged revisions 85530,85532-85534,85538-85543,85546-85548 via svnmerge from

2010-11-26 08:42:45 +00:00

xmlrpc

Merged revisions 86523 via svnmerge from

2010-11-18 17:11:45 +00:00

__future__.py

…

__phello__.foo.py

…

_abcoll.py

Merged revisions 86857 via svnmerge from

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

_compat_pickle.py

…

_dummy_thread.py

…

_markupbase.py

…

_pyio.py

Merged revisions 84814 via svnmerge from

2010-09-14 18:53:07 +00:00

_strptime.py

…

_threading_local.py

Merged revisions 84344 via svnmerge from

2010-08-28 18:27:09 +00:00

_weakrefset.py

(note: svnmerged from py3k, but the original message was wrong)

2010-01-08 17:56:16 +00:00

abc.py

Merged revisions 77791 via svnmerge from

2010-01-27 02:28:22 +00:00

aifc.py

…

antigravity.py

…

ast.py

remove support for byte literals; a new feature

2010-07-18 14:36:12 +00:00

asynchat.py

…

asyncore.py

Fix Issue 6706: return None on connect() in case of EWOULDBLOCK/ECONNABORTED error.

2010-11-01 15:18:09 +00:00

base64.py

Merged revisions 85497 via svnmerge from

2010-10-14 21:17:39 +00:00

bdb.py

Merged revisions 86861 via svnmerge from

2010-11-29 12:27:45 +00:00

binhex.py

Merged revisions 74289 via svnmerge from

2009-08-02 20:09:59 +00:00

bisect.py

…

calendar.py

Merged revisions 85728,85731,85735,85766-85771,85773,85777 via svnmerge from

2010-11-26 08:52:36 +00:00

cgi.py

Merged revisions 83901 via svnmerge from

2010-08-09 20:08:48 +00:00

cgitb.py

…

chunk.py

…

cmd.py

Merged revisions 83380 via svnmerge from

2010-08-01 04:14:22 +00:00

code.py

…

codecs.py

Merged revisions 81474 via svnmerge from

2010-05-22 17:01:13 +00:00

codeop.py

Merged revisions 75472 via svnmerge from

2009-10-18 00:34:08 +00:00

collections.py

Issue #9826: Handle recursive repr in collections.OrderedDict.

2010-09-12 05:28:42 +00:00

colorsys.py

…

compileall.py

Merged revisions 78991-78992,78994 via svnmerge from

2010-03-21 22:02:42 +00:00

configparser.py

Merged revisions 83226-83227,83229-83232 via svnmerge from

2010-08-01 21:03:01 +00:00

contextlib.py

…

copy.py

Merged revisions 84495-84497 via svnmerge from

2010-09-04 17:49:13 +00:00

copyreg.py

…

cProfile.py

Merged revisions 82805-82806,83523-83527,83536,83538,83542,83546-83548,83550-83555,83558,83560 via svnmerge from

2010-10-06 08:26:09 +00:00

csv.py

Merged revisions 75231 via svnmerge from

2009-10-04 14:54:52 +00:00

decimal.py

Merged revisions 82654 via svnmerge from

2010-07-08 21:18:21 +00:00

difflib.py

Merged revisions 76469 via svnmerge from

2009-11-23 19:06:11 +00:00

dis.py

…

doctest.py

Merged revisions 85503 via svnmerge from

2010-10-14 22:14:36 +00:00

dummy_threading.py

…

filecmp.py

…

fileinput.py

…

fnmatch.py

Merged revisions 82766 via svnmerge from

2010-07-10 14:00:10 +00:00

formatter.py

…

fractions.py

Merged revisions 76458 via svnmerge from

2009-11-23 16:28:18 +00:00

ftplib.py

Merged revisions 80228 via svnmerge from

2010-04-19 22:10:56 +00:00

functools.py

Issue 8814: functools.wraps() did not copy __annotations__.

2010-08-08 00:56:52 +00:00

genericpath.py

…

getopt.py

Merged revisions 83116 via svnmerge from

2010-07-24 01:11:58 +00:00

getpass.py

Merged revisions 87306 via svnmerge from

2010-12-16 03:27:11 +00:00

gettext.py

Merged revisions 85223 via svnmerge from

2010-10-04 23:57:46 +00:00

glob.py

…

gzip.py

Merged revisions 85291 via svnmerge from

2010-10-06 21:29:56 +00:00

hashlib.py

…

heapq.py

…

hmac.py

…

imaplib.py

Merged revisions 86391 via svnmerge from

2010-11-10 09:00:43 +00:00

imghdr.py

…

inspect.py

Merged revisions 85530,85532-85534,85538-85543,85546-85548 via svnmerge from

2010-11-26 08:42:45 +00:00

io.py

…

keyword.py

…

linecache.py

Merged revisions 85090 via svnmerge from

2010-09-29 01:31:23 +00:00

locale.py

Merged revisions 80521 via svnmerge from

2010-09-05 22:40:41 +00:00

macpath.py

Note: only the relevant parts of r79474 are merged.

2010-03-28 11:42:38 +00:00

macurl2path.py

Fixing Issue6711 - macurl2path has typos that raise AttributeError

2009-08-16 06:44:28 +00:00

mailbox.py

Merged revisions 83385-83389,83391 via svnmerge from

2010-08-01 19:04:55 +00:00

mailcap.py

Merged revisions 80368-80369 via svnmerge from

2010-04-22 13:56:42 +00:00

mimetypes.py

Merged revisions 85497 via svnmerge from

2010-10-14 21:17:39 +00:00

modulefinder.py

…

netrc.py

Merged revisions 86925 via svnmerge from

2010-12-02 03:10:43 +00:00

nntplib.py

…

ntpath.py

Merged revisions 85689 via svnmerge from

2010-10-18 13:49:09 +00:00

nturl2path.py

…

numbers.py

…

opcode.py

…

optparse.py

…

os2emxpath.py

…

os.py

Merged revisions 80421,80424 via svnmerge from

2010-04-25 22:39:07 +00:00

pdb.doc

…

pdb.py

Merged revisions 83259,83261,83264-83265,83268-83269,83271-83272,83281 via svnmerge from

2010-08-01 19:35:16 +00:00

pickle.py

Merged revisions 82937 via svnmerge from

2010-07-17 23:01:39 +00:00

pickletools.py

Merged revisions 83212,83829,83833,83838-83839,83878,84019,84025,84028,84032,84036 via svnmerge from

2010-08-14 18:24:40 +00:00

pipes.py

Merged revisions 81365,81367 via svnmerge from

2010-05-19 21:22:58 +00:00

pkgutil.py

Merged revisions 73833,73838,73850-73852,73856-73857 via svnmerge from

2009-08-13 09:04:31 +00:00

platform.py

Merged revisions 83644 via svnmerge from

2010-08-03 07:43:36 +00:00

plistlib.py

Merged revisions 74813 via svnmerge from

2009-09-16 00:57:27 +00:00

poplib.py

Merged revisions 74330 via svnmerge from

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

posixpath.py

Merged revisions 85689 via svnmerge from

2010-10-18 13:49:09 +00:00

pprint.py

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

2009-11-19 01:02:56 +00:00

profile.py

Merged revisions 82805-82806,83523-83527,83536,83538,83542,83546-83548,83550-83555,83558,83560 via svnmerge from

2010-10-06 08:26:09 +00:00

pstats.py

Merged revisions 86580 via svnmerge from

2010-11-20 17:08:19 +00:00

pty.py

…

py_compile.py

…

pyclbr.py

…

pydoc.py

Merged revisions 86504 via svnmerge from

2010-11-18 01:58:16 +00:00

queue.py

…

quopri.py

…

random.py

Issue #7435: Remove reference to long in docstring. Thanks flox.

2009-12-05 20:32:49 +00:00

re.py

…

reprlib.py

…

rlcompleter.py

…

runpy.py

…

sched.py

…

shelve.py

Merged revisions 78145 via svnmerge from

2010-02-11 03:06:51 +00:00

shlex.py

Merged revisions 85861 via svnmerge from

2010-10-27 18:54:06 +00:00

shutil.py

Merged revisions 80840 via svnmerge from

2010-05-05 22:44:06 +00:00

site.py

Merged revisions 85386-85387,85389 via svnmerge from

2010-10-12 22:56:55 +00:00

smtpd.py

Fix Issue 6706: return None on connect() in case of EWOULDBLOCK/ECONNABORTED error.

2010-11-01 15:18:09 +00:00

smtplib.py

Merged revisions 75064 via svnmerge from

2009-09-25 21:38:29 +00:00

sndhdr.py

Merged revisions 82856-82857 via svnmerge from

2010-07-13 23:19:20 +00:00

socket.py

Merged revisions 85420 via svnmerge from

2010-10-13 16:25:33 +00:00

socketserver.py

Merged revisions 80487,80489 via svnmerge from

2010-04-25 22:26:08 +00:00

sre_compile.py

…

sre_constants.py

…

sre_parse.py

Merged revisions 78729 via svnmerge from

2010-03-06 15:27:04 +00:00

ssl.py

Merged revisions 84807 via svnmerge from

2010-09-14 14:47:08 +00:00

stat.py

…

string.py

Merged revisions 75074 via svnmerge from

2009-09-26 12:35:01 +00:00

stringprep.py

…

struct.py

Merged revisions 81947-81950,81955-81956 via svnmerge from

2010-06-12 19:18:51 +00:00

subprocess.py

Merged revisions 87233 via svnmerge from

2010-12-14 15:16:24 +00:00

sunau.py

Merged revisions 81809 via svnmerge from

2010-06-07 20:24:48 +00:00

symbol.py

…

symtable.py

…

tabnanny.py

Merged revisions 81393 via svnmerge from

2010-05-21 10:53:32 +00:00

tarfile.py

Merged revisions 85211 via svnmerge from

2010-10-04 15:31:05 +00:00

telnetlib.py

Merged revisions 87230 via svnmerge from

2010-12-14 14:27:27 +00:00

tempfile.py

Merged revisions 76593 via svnmerge from

2009-11-30 00:16:44 +00:00

textwrap.py

Merged revisions 75231 via svnmerge from

2009-10-04 14:54:52 +00:00

this.py

…

threading.py

Merged revisions 87341 via svnmerge from

2010-12-17 17:44:45 +00:00

timeit.py

Merged revisions 83393,83396,83398,83404-83405,83408 via svnmerge from

2010-08-01 18:56:30 +00:00

token.py

…

tokenize.py

Merged revisions 84364 via svnmerge from

2010-08-30 14:44:53 +00:00

trace.py

Merged revisions 86229 via svnmerge from

2010-11-06 01:35:01 +00:00

traceback.py

Merged revisions 76573 via svnmerge from

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

tty.py

…

turtle.py

Merged revisions 86697 via svnmerge from

2010-11-22 19:45:06 +00:00

types.py

…

unittest.py

Merged revisions 87377 via svnmerge from

2010-12-18 17:55:43 +00:00

uu.py

Merged revisions 86037 via svnmerge from

2010-10-31 16:06:55 +00:00

uuid.py

Merged revisions 86192 via svnmerge from

2010-11-05 14:52:43 +00:00

warnings.py

Merged revisions 75797 via svnmerge from

2009-10-27 20:24:45 +00:00

wave.py

Merged revisions 85970 via svnmerge from

2010-11-20 11:29:58 +00:00

weakref.py

(note: svnmerged from py3k, but the original message was wrong)

2010-01-08 17:56:16 +00:00

webbrowser.py

Merged revisions 74745 via svnmerge from

2009-09-11 22:36:27 +00:00

wsgiref.egg-info

…

xdrlib.py

…

zipfile.py

Merged revisions 85450-85455,85460-85465 via svnmerge from

2010-11-26 08:37:46 +00:00