Benjamin Peterson d56a5d7156 Merged revisions 77103,77105-77106 via svnmerge from ... svn+ssh://pythondev@svn.python.org/python/branches/py3k ................ r77103 | benjamin.peterson | 2009-12-28 18:06:20 -0600 (Mon, 28 Dec 2009) | 57 lines Merged revisions 77102 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ................ r77102 | benjamin.peterson | 2009-12-28 17:50:41 -0600 (Mon, 28 Dec 2009) | 50 lines Merged revisions 76871-76872,77093-77095,77097-77101 via svnmerge from svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3 ........ r76871 | benjamin.peterson | 2009-12-17 20:49:21 -0600 (Thu, 17 Dec 2009) | 1 line handle unencodable diffs gracefully #5093 ........ r76872 | benjamin.peterson | 2009-12-17 20:51:37 -0600 (Thu, 17 Dec 2009) | 1 line fix emacs header ........ r77093 | benjamin.peterson | 2009-12-28 14:43:32 -0600 (Mon, 28 Dec 2009) | 7 lines replace callable(x) with isinstance(x, collections.Callable) #7006 This is a more accurate translation than hasattr(x, '__call__') which failed in the case that somebody had put __call__ in the instance dictionary. Patch mostly by Joe Amenta. ........ r77094 | benjamin.peterson | 2009-12-28 14:45:13 -0600 (Mon, 28 Dec 2009) | 2 lines deuglify imports ........ r77095 | benjamin.peterson | 2009-12-28 14:49:23 -0600 (Mon, 28 Dec 2009) | 1 line remove unused flag ........ r77097 | benjamin.peterson | 2009-12-28 16:12:13 -0600 (Mon, 28 Dec 2009) | 2 lines clean up imports and whitespace ........ r77098 | benjamin.peterson | 2009-12-28 16:43:35 -0600 (Mon, 28 Dec 2009) | 1 line *** empty log message *** ........ r77099 | benjamin.peterson | 2009-12-28 16:45:10 -0600 (Mon, 28 Dec 2009) | 1 line revert unintended change ........ r77100 | benjamin.peterson | 2009-12-28 16:53:21 -0600 (Mon, 28 Dec 2009) | 1 line revert unintended changes ........ r77101 | benjamin.peterson | 2009-12-28 17:46:02 -0600 (Mon, 28 Dec 2009) | 1 line normalize whitespace ........ ................ ................ r77105 | benjamin.peterson | 2009-12-28 18:37:04 -0600 (Mon, 28 Dec 2009) | 1 line fix test on py3 ................ r77106 | benjamin.peterson | 2009-12-28 18:38:47 -0600 (Mon, 28 Dec 2009) | 9 lines Merged revisions 77104 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r77104 | benjamin.peterson | 2009-12-28 18:09:33 -0600 (Mon, 28 Dec 2009) | 1 line enable test_main.py ........ ................		2009-12-29 00:44:14 +00:00
..
ctypes	Merged revisions 75064 via svnmerge from	2009-09-25 21:38:29 +00:00
curses	…
dbm	Backporting since it would have helped us find a regression.	2009-10-27 13:08:37 +00:00
distutils	Merged revisions 77028 via svnmerge from	2009-12-24 13:16:53 +00:00
email	Add mktime_tz to __all__. It's documented as being available in email.utils.	2009-11-25 18:45:04 +00:00
encodings	…
html	…
http	Merged revisions 76910 via svnmerge from	2009-12-20 07:18:22 +00:00
idlelib	Merged revisions 74745 via svnmerge from	2009-09-11 22:36:27 +00:00
importlib	Merged revisions 76146 via svnmerge from	2009-11-07 23:57:20 +00:00
json	Merged revisions 76710 via svnmerge from	2009-12-08 16:00:03 +00:00
lib2to3	Merged revisions 77103,77105-77106 via svnmerge from	2009-12-29 00:44:14 +00:00
logging	Merged revisions 75231 via svnmerge from	2009-10-04 14:54:52 +00:00
msilib	Merged revisions 73390 via svnmerge from	2009-06-12 17:31:41 +00:00
multiprocessing	Merged revisions 76247 via svnmerge from	2009-11-13 22:39:40 +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	update pydoc-topics	2009-06-26 13:05:03 +00:00
site-packages	…
sqlite3	Merged revisions 73833,73838,73850-73852,73856-73857 via svnmerge from	2009-08-13 09:04:31 +00:00
test	Merged revisions 77103,77105-77106 via svnmerge from	2009-12-29 00:44:14 +00:00
tkinter	Merged revisions 73715 via svnmerge from	2009-08-13 08:51:18 +00:00
urllib	Merged revisions 77060 via svnmerge from	2009-12-27 10:15:45 +00:00
wsgiref	Merged revisions 74821,74828-74831,74833,74835 via svnmerge from	2009-09-16 16:05:59 +00:00
xml	Merged revisions 76235 via svnmerge from	2009-11-13 02:29:35 +00:00
xmlrpc	Merged revisions 74821,74828-74831,74833,74835 via svnmerge from	2009-09-16 16:05:59 +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 76900 via svnmerge from	2009-12-19 21:09:58 +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 76119 via svnmerge from	2009-11-05 13:51:19 +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	…
asynchat.py	…
asyncore.py	This fixes bug 5798 on OS X.	2009-06-03 19:48:02 +00:00
base64.py	Merged revisions 73656,73658,73663,73666 via svnmerge from	2009-08-13 08:47:18 +00:00
bdb.py	Merged revisions 72322 via svnmerge from	2009-05-05 09:00:19 +00:00
binhex.py	Merged revisions 74289 via svnmerge from	2009-08-02 20:09:59 +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	…
cProfile.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	…
codecs.py	…
codeop.py	Merged revisions 75472 via svnmerge from	2009-10-18 00:34:08 +00:00
collections.py	Issue 6370: Performance issue with collections.Counter().	2009-06-29 18:34:46 +00:00
colorsys.py	…
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	Merged revisions 73518-73519 via svnmerge from	2009-06-23 10:55:52 +00:00
copy.py	Merged revisions 72669 via svnmerge from	2009-05-15 17:04:50 +00:00
copyreg.py	…
csv.py	Merged revisions 75231 via svnmerge from	2009-10-04 14:54:52 +00:00
decimal.py	Merged revisions 75947 via svnmerge from	2009-10-29 12:25:07 +00:00
difflib.py	Merged revisions 76469 via svnmerge from	2009-11-23 19:06:11 +00:00
dis.py	…
doctest.py	Merged revisions 76975 via svnmerge from	2009-12-21 12:53:36 +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 74476 via svnmerge from	2009-11-01 20:36:24 +00:00
formatter.py	…
fractions.py	Merged revisions 76458 via svnmerge from	2009-11-23 16:28:18 +00:00
ftplib.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
functools.py	…
genericpath.py	…
getopt.py	…
getpass.py	Merged revisions 76017 via svnmerge from	2009-11-01 18:48:31 +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 76836 via svnmerge from	2009-12-14 18:23:30 +00:00
hashlib.py	…
heapq.py	Make life easier for non-CPython implementations	2009-03-29 19:30:50 +00:00
hmac.py	…
imaplib.py	Merged revisions 77043 via svnmerge from	2009-12-24 16:15:31 +00:00
imghdr.py	…
inspect.py	Merged revisions 76235 via svnmerge from	2009-11-13 02:29:35 +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	Merged revisions 75537,75539 via svnmerge from	2009-10-19 19:47:59 +00:00
macpath.py	…
macurl2path.py	Fixing Issue6711 - macurl2path has typos that raise AttributeError	2009-08-16 06:44:28 +00:00
mailbox.py	Merged revisions 76055 via svnmerge from	2009-11-02 11:40:19 +00:00
mailcap.py	…
mimetypes.py	Fix default value in docstring.	2009-06-08 09:07:34 +00:00
modulefinder.py	…
netrc.py	…
nntplib.py	Merged revisions 72640 via svnmerge from	2009-05-14 21:30:46 +00:00
ntpath.py	Issue #5799: ntpath (ie, os.path on Windows) fully supports UNC pathnames.	2009-05-06 08:04:54 +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	…
opcode.py	…
optparse.py	Merged revisions 71540,71563 via svnmerge from	2009-04-27 16:41:41 +00:00
os.py	Merged revisions 76723 via svnmerge from	2009-12-09 00:03:16 +00:00
os2emxpath.py	…
pdb.doc	…
pdb.py	Merged revisions 74609,74627,74634,74645,74651,74738,74840,75016,75316-75317,75323-75324,75326,75328,75330,75338,75340-75341,75343,75352-75353,75355,75357,75359 via svnmerge from	2009-10-27 20:19:02 +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	Merged revisions 73833,73838,73850-73852,73856-73857 via svnmerge from	2009-08-13 09:04:31 +00:00
platform.py	Merged revisions 75231 via svnmerge from	2009-10-04 14:54:52 +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 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:02:56 +00:00
profile.py	Merged revisions 74775 via svnmerge from	2009-09-13 15:31:14 +00:00
pstats.py	…
pty.py	…
py_compile.py	…
pyclbr.py	…
pydoc.py	Recorded merge of revisions 76314 via svnmerge from	2009-11-15 23:27:31 +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	- remove svn:executable property from some library files	2009-06-22 14:17:00 +00:00
sched.py	Merged revisions 72932 via svnmerge from	2009-05-26 07:51:03 +00:00
shelve.py	…
shlex.py	…
shutil.py	Merged revisions 73250 via svnmerge from	2009-06-05 19:13:27 +00:00
site.py	Merged revisions 70778 via svnmerge from	2009-03-30 23:16:10 +00:00
smtpd.py	…
smtplib.py	Merged revisions 75064 via svnmerge from	2009-09-25 21:38:29 +00:00
sndhdr.py	…
socket.py	Merged revisions 73138 via svnmerge from	2009-06-02 07:41:26 +00:00
socketserver.py	…
sre_compile.py	…
sre_constants.py	…
sre_parse.py	…
ssl.py	More codestring -> codebytes.	2009-06-04 09:42:55 +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 75284 via svnmerge from	2009-10-08 16:02:50 +00:00
subprocess.py	Merged revisions 76170 via svnmerge from	2009-11-09 15:24:55 +00:00
sunau.py	…
symbol.py	Merged revisions 73196,73278-73280,73299,73308,73312-73313,73317-73318,73321,73324,73331,73335,73340,73363 via svnmerge from	2009-06-11 22:54:11 +00:00
symtable.py	Merged revisions 70801,70809 via svnmerge from	2009-03-31 15:26:37 +00:00
tabnanny.py	…
tarfile.py	Merged revisions 76836 via svnmerge from	2009-12-14 18:23:30 +00:00
telnetlib.py	Merged revisions 74217,74224 via svnmerge from	2009-08-13 08:39:33 +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 76138,76173 via svnmerge from	2009-11-09 16:52:46 +00:00
timeit.py	Localize the function lookup in timeit.	2009-04-03 02:45:36 +00:00
token.py	…
tokenize.py	Merged revisions 76235 via svnmerge from	2009-11-13 02:29:35 +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	Merged revisions 76573 via svnmerge from	2009-11-28 16:16:09 +00:00
tty.py	…
turtle.py	Merged revisions 75393,75416,75581,75609,75615 via svnmerge from	2009-10-27 20:23:20 +00:00
types.py	…
unittest.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
uu.py	Merged revisions 74821,74828-74831,74833,74835 via svnmerge from	2009-09-16 16:05:59 +00:00
uuid.py	…
warnings.py	Merged revisions 75797 via svnmerge from	2009-10-27 20:24:45 +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 74745 via svnmerge from	2009-09-11 22:36:27 +00:00
wsgiref.egg-info	…
xdrlib.py	…
zipfile.py	Merged revisions 75064 via svnmerge from	2009-09-25 21:38:29 +00:00