[Python-checkins] cpython (merge 3.5 -> default): Merge with 3.5.

[serhiy.storchaka]

https://hg.python.org/cpython/rev/39a24ce364dc
changeset:   98563:39a24ce364dc
parent:      98561:727d72b05ff5
parent:      98562:b0ce3ef2ea21
user:        Serhiy Storchaka <storchaka at gmail.com>
date:        Tue Oct 06 18:52:52 2015 +0300
summary:
  Merge with 3.5.

files:
  Lib/pydoc.py                      |  0 
  Lib/site-packages/README          |  2 ++
  Lib/test/regrtest.py              |  0 
  Lib/timeit.py                     |  0 
  Parser/asdl_c.py                  |  0 
  Tools/buildbot/build-amd64.bat    |  5 +++++
  Tools/buildbot/clean-amd64.bat    |  5 +++++
  Tools/buildbot/external-amd64.bat |  3 +++
  Tools/buildbot/external.bat       |  3 +++
  Tools/buildbot/test-amd64.bat     |  6 ++++++
  configure                         |  0 
  11 files changed, 24 insertions(+), 0 deletions(-)


diff --git a/Lib/pydoc.py b/Lib/pydoc.py
old mode 100755
new mode 100644
diff --git a/Lib/site-packages/README b/Lib/site-packages/README
new file mode 100644
--- /dev/null
+++ b/Lib/site-packages/README
@@ -0,0 +1,2 @@
+This directory exists so that 3rd party packages can be installed
+here.  Read the source for site.py for more details.
diff --git a/Lib/test/regrtest.py b/Lib/test/regrtest.py
old mode 100755
new mode 100644
diff --git a/Lib/timeit.py b/Lib/timeit.py
old mode 100755
new mode 100644
diff --git a/Parser/asdl_c.py b/Parser/asdl_c.py
old mode 100755
new mode 100644
diff --git a/Tools/buildbot/build-amd64.bat b/Tools/buildbot/build-amd64.bat
new file mode 100644
--- /dev/null
+++ b/Tools/buildbot/build-amd64.bat
@@ -0,0 +1,5 @@
+ at rem Formerly used by the buildbot "compile" step.
+ at echo This script is no longer used and may be removed in the future.
+ at echo To get the same effect as this script, use
+ at echo     PCbuild\build.bat -d -e -k -p x64
+call "%~dp0build.bat" -p x64 %*
diff --git a/Tools/buildbot/clean-amd64.bat b/Tools/buildbot/clean-amd64.bat
new file mode 100644
--- /dev/null
+++ b/Tools/buildbot/clean-amd64.bat
@@ -0,0 +1,5 @@
+ at rem Formerly used by the buildbot "clean" step.
+ at echo This script is no longer used and may be removed in the future.
+ at echo To get the same effect as this script, use `clean.bat` from this
+ at echo directory and pass `-p x64` as two arguments.
+call "%~dp0clean.bat" -p x64 %*
diff --git a/Tools/buildbot/external-amd64.bat b/Tools/buildbot/external-amd64.bat
new file mode 100644
--- /dev/null
+++ b/Tools/buildbot/external-amd64.bat
@@ -0,0 +1,3 @@
+ at echo This script is no longer used and may be removed in the future.
+ at echo Please use PCbuild\get_externals.bat instead.
+@"%~dp0..\..\PCbuild\get_externals.bat" %*
diff --git a/Tools/buildbot/external.bat b/Tools/buildbot/external.bat
new file mode 100644
--- /dev/null
+++ b/Tools/buildbot/external.bat
@@ -0,0 +1,3 @@
+ at echo This script is no longer used and may be removed in the future.
+ at echo Please use PCbuild\get_externals.bat instead.
+@"%~dp0..\..\PCbuild\get_externals.bat" %*
diff --git a/Tools/buildbot/test-amd64.bat b/Tools/buildbot/test-amd64.bat
new file mode 100644
--- /dev/null
+++ b/Tools/buildbot/test-amd64.bat
@@ -0,0 +1,6 @@
+ at rem Formerly used by the buildbot "test" step.
+ at echo This script is no longer used and may be removed in the future.
+ at echo To get the same effect as this script, use
+ at echo     PCbuild\rt.bat -q -d -x64 -uall -rwW
+ at echo or use `test.bat` in this directory and pass `-x64` as an argument.
+call "%~dp0test.bat" -x64 %*
diff --git a/configure b/configure
old mode 100755
new mode 100644

-- 
Repository URL: https://hg.python.org/cpython