mirror of https://github.com/python/cpython
ffa94b0f02
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
........
................
|
||
|---|---|---|
| .. | ||
| __init__.py | ||
| fix_apply.py | ||
| fix_basestring.py | ||
| fix_buffer.py | ||
| fix_callable.py | ||
| fix_dict.py | ||
| fix_except.py | ||
| fix_exec.py | ||
| fix_execfile.py | ||
| fix_filter.py | ||
| fix_funcattrs.py | ||
| fix_future.py | ||
| fix_getcwdu.py | ||
| fix_has_key.py | ||
| fix_idioms.py | ||
| fix_import.py | ||
| fix_imports.py | ||
| fix_imports2.py | ||
| fix_input.py | ||
| fix_intern.py | ||
| fix_isinstance.py | ||
| fix_itertools.py | ||
| fix_itertools_imports.py | ||
| fix_long.py | ||
| fix_map.py | ||
| fix_metaclass.py | ||
| fix_methodattrs.py | ||
| fix_ne.py | ||
| fix_next.py | ||
| fix_nonzero.py | ||
| fix_numliterals.py | ||
| fix_operator.py | ||
| fix_paren.py | ||
| fix_print.py | ||
| fix_raise.py | ||
| fix_raw_input.py | ||
| fix_reduce.py | ||
| fix_renames.py | ||
| fix_repr.py | ||
| fix_set_literal.py | ||
| fix_standarderror.py | ||
| fix_sys_exc.py | ||
| fix_throw.py | ||
| fix_tuple_params.py | ||
| fix_types.py | ||
| fix_unicode.py | ||
| fix_urllib.py | ||
| fix_ws_comma.py | ||
| fix_xrange.py | ||
| fix_xreadlines.py | ||
| fix_zip.py | ||