]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
projects / thirdparty / Python / cpython.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 53c6651 407b3bd)
Issue #14696: Merge from 3.2
authorMark Dickinson <mdickinson@enthought.com>
Sun, 29 Apr 2012 21:20:01 +0000 (22:20 +0100)
committerMark Dickinson <mdickinson@enthought.com>
Sun, 29 Apr 2012 21:20:01 +0000 (22:20 +0100)
1  2 
Lib/test/test_parser.py patch | diff1 | diff2 | blob | history
Misc/NEWS patch | diff1 | diff2 | blob | history
Modules/parsermodule.c patch | diff1 | diff2 | blob | history

diff --cc Lib/test/test_parser.py
Simple merge
diff --cc Misc/NEWS
Simple merge
diff --cc Modules/parsermodule.c
Simple merge
Mirror of https://github.com/python/cpython.git