From: Serhiy Storchaka Date: Tue, 6 Oct 2015 15:52:52 +0000 (+0300) Subject: Merge with 3.5. X-Git-Tag: v3.6.0a1~1317 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fc632e3912ba9bb6ec20359148f05ca3ec231663;p=thirdparty%2FPython%2Fcpython.git Merge with 3.5. --- fc632e3912ba9bb6ec20359148f05ca3ec231663 diff --cc Lib/pydoc.py index f4f253010f49,ee558bfea3b5..f4f253010f49 mode 100755,100755..100644 --- a/Lib/pydoc.py +++ b/Lib/pydoc.py diff --cc Lib/test/regrtest.py index fcc39375c031,a04c3f78b214..fcc39375c031 mode 100755,100755..100644 --- a/Lib/test/regrtest.py +++ b/Lib/test/regrtest.py diff --cc Lib/timeit.py index 98cb3eb89a82,2de88f7271a0..98cb3eb89a82 mode 100755,100755..100644 --- a/Lib/timeit.py +++ b/Lib/timeit.py diff --cc Parser/asdl_c.py index d5971226b188,a5e35d93fd29..d5971226b188 mode 100755,100755..100644 --- a/Parser/asdl_c.py +++ b/Parser/asdl_c.py diff --cc configure index 1046f0a1ba86,398f12160fc8..1046f0a1ba86 mode 100755,100755..100644 --- a/configure +++ b/configure