]> 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: 4a5fae1 16d2b47)
#15796: merge with 3.2.
authorEzio Melotti <ezio.melotti@gmail.com>
Tue, 18 Sep 2012 04:21:18 +0000 (07:21 +0300)
committerEzio Melotti <ezio.melotti@gmail.com>
Tue, 18 Sep 2012 04:21:18 +0000 (07:21 +0300)
1  2 
Modules/_io/_iomodule.c patch | diff1 | diff2 | blob | history
Modules/_io/iobase.c patch | diff1 | diff2 | blob | history
Modules/_io/textio.c patch | diff1 | diff2 | blob | history

diff --cc Modules/_io/_iomodule.c
Simple merge
diff --cc Modules/_io/iobase.c
Simple merge
diff --cc Modules/_io/textio.c
Simple merge
Mirror of https://github.com/python/cpython.git