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: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fc632e3912ba9bb6ec20359148f05ca3ec231663;p=python Merge with 3.5. --- fc632e3912ba9bb6ec20359148f05ca3ec231663 diff --cc Lib/pydoc.py index f4f253010f,ee558bfea3..f4f253010f mode 100755,100755..100644 --- a/Lib/pydoc.py +++ b/Lib/pydoc.py diff --cc Lib/test/regrtest.py index fcc39375c0,a04c3f78b2..fcc39375c0 mode 100755,100755..100644 --- a/Lib/test/regrtest.py +++ b/Lib/test/regrtest.py diff --cc Lib/timeit.py index 98cb3eb89a,2de88f7271..98cb3eb89a mode 100755,100755..100644 --- a/Lib/timeit.py +++ b/Lib/timeit.py diff --cc Parser/asdl_c.py index d5971226b1,a5e35d93fd..d5971226b1 mode 100755,100755..100644 --- a/Parser/asdl_c.py +++ b/Parser/asdl_c.py diff --cc configure index 1046f0a1ba,398f12160f..1046f0a1ba mode 100755,100755..100644 --- a/configure +++ b/configure