Mailman 3 June 2016 - Python-checkins

cpython (merge 3.5 -> default): Merge 3.5 (asyncio)
by yury.selivanov June 28, 2016

June 28, 2016

https://hg.python.org/cpython/rev/a9b4da316283 changeset: 102221:a9b4da316283 parent: 102219:e5063a82f490 parent: 102220:100cf3f268ca user: Yury Selivanov <yury(a)magic.io> date: Tue Jun 28 10:55:49 2016 -0400 summary: Merge 3.5 (asyncio) files: Lib/asyncio/sslproto.py | 1 + Lib/test/test_asyncio/test_sslproto.py | 16 ++++++++++++++ 2 files changed, 17 insertions(+), 0 deletions(-) diff --git a/Lib/asyncio/sslproto.py b/Lib/asyncio/sslproto.py --- a/Lib/asyncio/sslproto.py +++ b/Lib/asyncio/sslproto.py @@ -5,6 +5,7 @@ except ImportError: # pragma: no cover ssl = None +from . import base_events from . import compat from . import protocols from . import transports diff --git a/Lib/test/test_asyncio/test_sslproto.py b/Lib/test/test_asyncio/test_sslproto.py --- a/Lib/test/test_asyncio/test_sslproto.py +++ b/Lib/test/test_asyncio/test_sslproto.py @@ -1,5 +1,6 @@ """Tests for asyncio/sslproto.py.""" +import logging import unittest from unittest import mock try: @@ -8,6 +9,7 @@ ssl = None import asyncio +from asyncio import log from asyncio import sslproto from asyncio import test_utils @@ -66,6 +68,20 @@ test_utils.run_briefly(self.loop) self.assertIsInstance(waiter.exception(), ConnectionResetError) + def test_fatal_error_no_name_error(self): + # From issue #363. + # _fatal_error() generates a NameError if sslproto.py + # does not import base_events. + waiter = asyncio.Future(loop=self.loop) + ssl_proto = self.ssl_protocol(waiter) + # Temporarily turn off error logging so as not to spoil test output. + log_level = log.logger.getEffectiveLevel() + log.logger.setLevel(logging.FATAL) + try: + ssl_proto._fatal_error(None) + finally: + # Restore error logging. + log.logger.setLevel(log_level) if __name__ == '__main__': unittest.main() -- Repository URL: https://hg.python.org/cpython

1 0

cpython (3.5): asyncio: Fix NameError in sslproto _fatal_error()
by yury.selivanov June 28, 2016

June 28, 2016

https://hg.python.org/cpython/rev/100cf3f268ca changeset: 102220:100cf3f268ca branch: 3.5 parent: 102217:87440b63349b user: Yury Selivanov <yury(a)magic.io> date: Tue Jun 28 10:55:36 2016 -0400 summary: asyncio: Fix NameError in sslproto _fatal_error() Patch by Richard Walker. files: Lib/asyncio/sslproto.py | 1 + Lib/test/test_asyncio/test_sslproto.py | 16 ++++++++++++++ 2 files changed, 17 insertions(+), 0 deletions(-) diff --git a/Lib/asyncio/sslproto.py b/Lib/asyncio/sslproto.py --- a/Lib/asyncio/sslproto.py +++ b/Lib/asyncio/sslproto.py @@ -5,6 +5,7 @@ except ImportError: # pragma: no cover ssl = None +from . import base_events from . import compat from . import protocols from . import transports diff --git a/Lib/test/test_asyncio/test_sslproto.py b/Lib/test/test_asyncio/test_sslproto.py --- a/Lib/test/test_asyncio/test_sslproto.py +++ b/Lib/test/test_asyncio/test_sslproto.py @@ -1,5 +1,6 @@ """Tests for asyncio/sslproto.py.""" +import logging import unittest from unittest import mock try: @@ -8,6 +9,7 @@ ssl = None import asyncio +from asyncio import log from asyncio import sslproto from asyncio import test_utils @@ -66,6 +68,20 @@ test_utils.run_briefly(self.loop) self.assertIsInstance(waiter.exception(), ConnectionResetError) + def test_fatal_error_no_name_error(self): + # From issue #363. + # _fatal_error() generates a NameError if sslproto.py + # does not import base_events. + waiter = asyncio.Future(loop=self.loop) + ssl_proto = self.ssl_protocol(waiter) + # Temporarily turn off error logging so as not to spoil test output. + log_level = log.logger.getEffectiveLevel() + log.logger.setLevel(logging.FATAL) + try: + ssl_proto._fatal_error(None) + finally: + # Restore error logging. + log.logger.setLevel(log_level) if __name__ == '__main__': unittest.main() -- Repository URL: https://hg.python.org/cpython

1 0

Daily reference leaks (e5063a82f490): sum=0
by solipsis＠pitrou.net June 28, 2016

June 28, 2016

results for e5063a82f490 on branch "default" -------------------------------------------- test_collections leaked [0, -4, 0] memory blocks, sum=-4 test_functools leaked [0, 3, 1] memory blocks, sum=4 Command line was: ['./python', '-m', 'test.regrtest', '-uall', '-R', '3:3:/home/psf-users/antoine/refleaks/reflogULT0eC', '--timeout', '7200']

1 0

NEUTRAL Benchmark Results for Python 2.7 2016-06-28
by lp_benchmark_robot＠intel.com June 28, 2016

June 28, 2016

Results for project Python 2.7, build date 2016-06-28 02:46:41 +0000 commit: ccec979392d7 previous commit: e2d0d921d526 revision date: 2016-06-27 16:54:03 +0000 environment: Haswell-EP cpu: Intel(R) Xeon(R) CPU E5-2699 v3 @ 2.30GHz 2x18 cores, stepping 2, LLC 45 MB mem: 128 GB os: CentOS 7.1 kernel: Linux 3.10.0-229.4.2.el7.x86_64 Baseline results were generated using release v2.7.10, with hash 15c95b7d81dc from 2015-05-23 16:02:14+00:00 ---------------------------------------------------------------------------------- benchmark relative change since change since current rev run std_dev* last run baseline with PGO ---------------------------------------------------------------------------------- :-) django_v2 0.14% 0.11% 4.69% 3.86% :-) pybench 0.20% 0.10% 5.85% 4.18% :-( regex_v8 0.48% 0.01% -2.41% 11.07% :-) nbody 0.05% 0.03% 8.96% 3.00% :-) json_dump_v2 0.42% 0.81% 2.48% 11.78% :-( normal_startup 1.96% 0.23% -5.72% 1.43% :-| ssbench 0.17% 0.07% 2.00% 1.96% ---------------------------------------------------------------------------------- * Relative Standard Deviation (Standard Deviation/Average) If this is not displayed properly please visit our results page here: http://languagesperformance.intel.com/neutral-benchmark-results-for-python-… Note: Benchmark results for ssbench are measured in requests/second while all other are measured in seconds. Subject Label Legend: Attributes are determined based on the performance evolution of the workloads compared to the previous measurement iteration. NEUTRAL: performance did not change by more than 1% for any workload GOOD: performance improved by more than 1% for at least one workload and there is no regression greater than 1% BAD: performance dropped by more than 1% for at least one workload and there is no improvement greater than 1% UGLY: performance improved by more than 1% for at least one workload and also dropped by more than 1% for at least one workload Our lab does a nightly source pull and build of the Python project and measures performance changes against the previous stable version and the previous nightly measurement. This is provided as a service to the community so that quality issues with current hardware can be identified quickly. Intel technologies' features and benefits depend on system configuration and may require enabled hardware, software or service activation. Performance varies depending on system configuration.

1 0

BAD Benchmark Results for Python Default 2016-06-28
by lp_benchmark_robot＠intel.com June 28, 2016

June 28, 2016

Results for project Python default, build date 2016-06-28 02:02:44 +0000 commit: e5063a82f490 previous commit: 447c20169c92 revision date: 2016-06-27 20:40:43 +0000 environment: Haswell-EP cpu: Intel(R) Xeon(R) CPU E5-2699 v3 @ 2.30GHz 2x18 cores, stepping 2, LLC 45 MB mem: 128 GB os: CentOS 7.1 kernel: Linux 3.10.0-229.4.2.el7.x86_64 Baseline results were generated using release v3.4.3, with hash b4cbecbc0781 from 2015-02-25 12:15:33+00:00 ---------------------------------------------------------------------------------- benchmark relative change since change since current rev run std_dev* last run baseline with PGO ---------------------------------------------------------------------------------- :-) django_v2 0.14% -2.85% 9.23% 18.09% :-| pybench 0.08% 0.21% 1.50% 8.33% :-( regex_v8 2.64% 0.12% -2.44% 3.55% :-| nbody 0.10% -0.43% -0.42% 11.03% :-( json_dump_v2 0.29% 0.09% -2.03% 11.58% :-| normal_startup 1.00% -0.12% 1.22% 5.98% ---------------------------------------------------------------------------------- * Relative Standard Deviation (Standard Deviation/Average) If this is not displayed properly please visit our results page here: http://languagesperformance.intel.com/bad-benchmark-results-for-python-defa… Note: Benchmark results are measured in seconds. Subject Label Legend: Attributes are determined based on the performance evolution of the workloads compared to the previous measurement iteration. NEUTRAL: performance did not change by more than 1% for any workload GOOD: performance improved by more than 1% for at least one workload and there is no regression greater than 1% BAD: performance dropped by more than 1% for at least one workload and there is no improvement greater than 1% UGLY: performance improved by more than 1% for at least one workload and also dropped by more than 1% for at least one workload Our lab does a nightly source pull and build of the Python project and measures performance changes against the previous stable version and the previous nightly measurement. This is provided as a service to the community so that quality issues with current hardware can be identified quickly. Intel technologies' features and benefits depend on system configuration and may require enabled hardware, software or service activation. Performance varies depending on system configuration.

1 0

cpython: Issue #27352: Fixed an error message in a test.
by serhiy.storchaka June 27, 2016

June 27, 2016

https://hg.python.org/cpython/rev/e5063a82f490 changeset: 102219:e5063a82f490 user: Serhiy Storchaka <storchaka(a)gmail.com> date: Mon Jun 27 23:40:43 2016 +0300 summary: Issue #27352: Fixed an error message in a test. files: Lib/test/test_ast.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Lib/test/test_ast.py b/Lib/test/test_ast.py --- a/Lib/test/test_ast.py +++ b/Lib/test/test_ast.py @@ -754,7 +754,7 @@ def test_importfrom(self): imp = ast.ImportFrom(None, [ast.alias("x", None)], -42) - self.stmt(imp, "level less than -1") + self.stmt(imp, "Negative ImportFrom level") self.stmt(ast.ImportFrom(None, [], 0), "empty names on ImportFrom") def test_global(self): -- Repository URL: https://hg.python.org/cpython

1 0

cpython (3.5): Adds script for purging the caching server for downloads on python.org.
by steve.dower June 27, 2016

June 27, 2016

https://hg.python.org/cpython/rev/87440b63349b changeset: 102217:87440b63349b branch: 3.5 parent: 102213:2210765a2770 user: Steve Dower <steve.dower(a)microsoft.com> date: Mon Jun 27 12:30:48 2016 -0700 summary: Adds script for purging the caching server for downloads on python.org. files: Tools/msi/purge.py | 74 ++++++++++++++++++++++++++++++++++ 1 files changed, 74 insertions(+), 0 deletions(-) diff --git a/Tools/msi/purge.py b/Tools/msi/purge.py new file mode 100644 --- /dev/null +++ b/Tools/msi/purge.py @@ -0,0 +1,74 @@ +# Purges the Fastly cache for Windows download files +# +# Usage: +# py -3 purge.py 3.5.1rc1 +# + +__author__ = 'Steve Dower <steve.dower(a)python.org>' +__version__ = '1.0.0' + +import re +import sys + +from urllib.request import * + +VERSION_RE = re.compile(r'(\d+\.\d+\.\d+)(\w+\d+)?$') + +try: + m = VERSION_RE.match(sys.argv[1]) + if not m: + print('Invalid version:', sys.argv[1]) + print('Expected something like "3.5.1rc1"') + sys.exit(1) +except LookupError: + print('Missing version argument. Expected something like "3.5.1rc1"') + sys.exit(1) + +URL = "https://www.python.org/ftp/python/{}/".format(m.group(1)) + + +FILES = [ + "core.msi", + "core_d.msi", + "core_pdb.msi", + "dev.msi", + "dev_d.msi", + "doc.msi", + "exe.msi", + "exe_d.msi", + "exe_pdb.msi", + "launcher.msi", + "lib.msi", + "lib_d.msi", + "lib_pdb.msi", + "path.msi", + "pip.msi", + "tcltk.msi", + "tcltk_d.msi", + "tcltk_pdb.msi", + "test.msi", + "test_d.msi", + "test_pdb.msi", + "tools.msi", + "Windows6.0-KB2999226-x64.msu", + "Windows6.0-KB2999226-x86.msu", + "Windows6.1-KB2999226-x64.msu", + "Windows6.1-KB2999226-x86.msu", + "Windows8.1-KB2999226-x64.msu", + "Windows8.1-KB2999226-x86.msu", + "Windows8-RT-KB2999226-x64.msu", + "Windows8-RT-KB2999226-x86.msu", +] +PATHS = [ + "python-{}.exe".format(m.group(0)), + "python-{}-webinstall.exe".format(m.group(0)), + "python-{}-amd64.exe".format(m.group(0)), + "python-{}-amd64-webinstall.exe".format(m.group(0)), +] + ["win32{}/{}".format(m.group(2), f) for f in FILES] + ["amd64{}/{}".format(m.group(2), f) for f in FILES] + +print('Purged:') +for n in PATHS: + u = URL + n + with urlopen(Request(u, method='PURGE', headers={'Fastly-Soft-Purge': 1})) as r: + r.read() + print(' ', u) -- Repository URL: https://hg.python.org/cpython

1 0

cpython (merge 3.5 -> default): Merge from 3.5
by steve.dower June 27, 2016

June 27, 2016

https://hg.python.org/cpython/rev/2adb8af9fffd changeset: 102218:2adb8af9fffd parent: 102216:e3164c9edb0b parent: 102217:87440b63349b user: Steve Dower <steve.dower(a)microsoft.com> date: Mon Jun 27 12:31:00 2016 -0700 summary: Merge from 3.5 files: Tools/msi/purge.py | 74 ++++++++++++++++++++++++++++++++++ 1 files changed, 74 insertions(+), 0 deletions(-) diff --git a/Tools/msi/purge.py b/Tools/msi/purge.py new file mode 100644 --- /dev/null +++ b/Tools/msi/purge.py @@ -0,0 +1,74 @@ +# Purges the Fastly cache for Windows download files +# +# Usage: +# py -3 purge.py 3.5.1rc1 +# + +__author__ = 'Steve Dower <steve.dower(a)python.org>' +__version__ = '1.0.0' + +import re +import sys + +from urllib.request import * + +VERSION_RE = re.compile(r'(\d+\.\d+\.\d+)(\w+\d+)?$') + +try: + m = VERSION_RE.match(sys.argv[1]) + if not m: + print('Invalid version:', sys.argv[1]) + print('Expected something like "3.5.1rc1"') + sys.exit(1) +except LookupError: + print('Missing version argument. Expected something like "3.5.1rc1"') + sys.exit(1) + +URL = "https://www.python.org/ftp/python/{}/".format(m.group(1)) + + +FILES = [ + "core.msi", + "core_d.msi", + "core_pdb.msi", + "dev.msi", + "dev_d.msi", + "doc.msi", + "exe.msi", + "exe_d.msi", + "exe_pdb.msi", + "launcher.msi", + "lib.msi", + "lib_d.msi", + "lib_pdb.msi", + "path.msi", + "pip.msi", + "tcltk.msi", + "tcltk_d.msi", + "tcltk_pdb.msi", + "test.msi", + "test_d.msi", + "test_pdb.msi", + "tools.msi", + "Windows6.0-KB2999226-x64.msu", + "Windows6.0-KB2999226-x86.msu", + "Windows6.1-KB2999226-x64.msu", + "Windows6.1-KB2999226-x86.msu", + "Windows8.1-KB2999226-x64.msu", + "Windows8.1-KB2999226-x86.msu", + "Windows8-RT-KB2999226-x64.msu", + "Windows8-RT-KB2999226-x86.msu", +] +PATHS = [ + "python-{}.exe".format(m.group(0)), + "python-{}-webinstall.exe".format(m.group(0)), + "python-{}-amd64.exe".format(m.group(0)), + "python-{}-amd64-webinstall.exe".format(m.group(0)), +] + ["win32{}/{}".format(m.group(2), f) for f in FILES] + ["amd64{}/{}".format(m.group(2), f) for f in FILES] + +print('Purged:') +for n in PATHS: + u = URL + n + with urlopen(Request(u, method='PURGE', headers={'Fastly-Soft-Purge': 1})) as r: + r.read() + print(' ', u) -- Repository URL: https://hg.python.org/cpython

1 0

cpython: Issue #27352: Correct the validation of the ImportFrom AST node and simplify
by serhiy.storchaka June 27, 2016

June 27, 2016

https://hg.python.org/cpython/rev/e3164c9edb0b changeset: 102216:e3164c9edb0b parent: 102214:aa1e1f7e17cc user: Serhiy Storchaka <storchaka(a)gmail.com> date: Mon Jun 27 21:39:12 2016 +0300 summary: Issue #27352: Correct the validation of the ImportFrom AST node and simplify the implementation of the IMPORT_NAME opcode. files: Python/ast.c | 4 ++-- Python/ceval.c | 10 +--------- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/Python/ast.c b/Python/ast.c --- a/Python/ast.c +++ b/Python/ast.c @@ -475,8 +475,8 @@ case Import_kind: return validate_nonempty_seq(stmt->v.Import.names, "names", "Import"); case ImportFrom_kind: - if (stmt->v.ImportFrom.level < -1) { - PyErr_SetString(PyExc_ValueError, "ImportFrom level less than -1"); + if (stmt->v.ImportFrom.level < 0) { + PyErr_SetString(PyExc_ValueError, "Negative ImportFrom level"); return 0; } return validate_nonempty_seq(stmt->v.ImportFrom.names, "names", "ImportFrom"); diff --git a/Python/ceval.c b/Python/ceval.c --- a/Python/ceval.c +++ b/Python/ceval.c @@ -2820,21 +2820,13 @@ Py_INCREF(func); from = POP(); level = TOP(); - if (PyLong_AsLong(level) != -1 || PyErr_Occurred()) - args = PyTuple_Pack(5, + args = PyTuple_Pack(5, name, f->f_globals, f->f_locals == NULL ? Py_None : f->f_locals, from, level); - else - args = PyTuple_Pack(4, - name, - f->f_globals, - f->f_locals == NULL ? - Py_None : f->f_locals, - from); Py_DECREF(level); Py_DECREF(from); if (args == NULL) { -- Repository URL: https://hg.python.org/cpython

1 0

cpython (2.7): Adds batch file for building nuget package, and includes libs folder
by steve.dower June 27, 2016

June 27, 2016

https://hg.python.org/cpython/rev/ccec979392d7 changeset: 102215:ccec979392d7 branch: 2.7 parent: 102185:e2d0d921d526 user: Steve Dower <steve.dower(a)microsoft.com> date: Mon Jun 27 09:54:03 2016 -0700 summary: Adds batch file for building nuget package, and includes libs folder files: Tools/nuget/build.bat | 63 +++++++++++++++++++++++++++ Tools/nuget/make_pkg.proj | 5 +- Tools/nuget/make_zip.py | 37 +++++++++++---- 3 files changed, 94 insertions(+), 11 deletions(-) diff --git a/Tools/nuget/build.bat b/Tools/nuget/build.bat new file mode 100644 --- /dev/null +++ b/Tools/nuget/build.bat @@ -0,0 +1,63 @@ +@echo off +setlocal +set D=%~dp0 +set PCBUILD=%D%..\..\PCBuild\ + +set BUILDX86= +set BUILDX64= +set REBUILD= +set OUTPUT= +set PACKAGES= + +:CheckOpts +if "%~1" EQU "-h" goto Help +if "%~1" EQU "-x86" (set BUILDX86=1) && shift && goto CheckOpts +if "%~1" EQU "-x64" (set BUILDX64=1) && shift && goto CheckOpts +if "%~1" EQU "-r" (set REBUILD=-r) && shift && goto CheckOpts +if "%~1" EQU "-o" (set OUTPUT="/p:OutputPath=%~2") && shift && shift && goto CheckOpts +if "%~1" EQU "--out" (set OUTPUT="/p:OutputPath=%~2") && shift && shift && goto CheckOpts +if "%~1" EQU "-p" (set PACKAGES=%PACKAGES% %~2) && shift && shift && goto CheckOpts + +if not defined BUILDX86 if not defined BUILDX64 (set BUILDX86=1) && (set BUILDX64=1) + +if not defined NUGET where nuget -q || echo Cannot find nuget.exe on PATH and NUGET is not set. && exit /B 1 +if not defined PYTHON set PYTHON=py -3 + +@%PYTHON% -c "" >nul 2>nul +@if errorlevel 1 ( + %NUGET% install python -OutputDirectory "%D%obj" -ExcludeVersion -NonInteractive + set PYTHON="%D%obj\python\tools\python.exe" +) + +call "%PCBUILD%env.bat" x86 + +if defined PACKAGES set PACKAGES="/p:Packages=%PACKAGES%" + +if defined BUILDX86 ( + if defined REBUILD ( call "%PCBUILD%build.bat" -e -r + ) else if not exist "%PCBUILD%python.exe" call "%PCBUILD%build.bat" -e + if errorlevel 1 goto :eof + + msbuild "%D%make_pkg.proj" /p:Configuration=Release /p:Platform=x86 %OUTPUT% %PACKAGES% + if errorlevel 1 goto :eof +) + +if defined BUILDX64 ( + if defined REBUILD ( call "%PCBUILD%build.bat" -p x64 -e -r + ) else if not exist "%PCBUILD%amd64\python.exe" call "%PCBUILD%build.bat" -p x64 -e + if errorlevel 1 goto :eof + + msbuild "%D%make_pkg.proj" /p:Configuration=Release /p:Platform=x64 %OUTPUT% %PACKAGES% + if errorlevel 1 goto :eof +) + +exit /B 0 + +:Help +echo build.bat [-x86] [-x64] [--out DIR] [-r] [-h] +echo. +echo -x86 Build x86 installers +echo -x64 Build x64 installers +echo -r Rebuild rather than incremental build +echo --out [DIR] Override output directory +echo -h Show usage diff --git a/Tools/nuget/make_pkg.proj b/Tools/nuget/make_pkg.proj --- a/Tools/nuget/make_pkg.proj +++ b/Tools/nuget/make_pkg.proj @@ -7,6 +7,7 @@ <OutputPath Condition="$(OutputPath) == ''">$(MSBuildThisFileDirectory)</OutputPath> <OutputSuffix></OutputSuffix> <SupportSigning>false</SupportSigning> + <BuildForRelease Condition="$(BuildForRelease) == ''">true</BuildForRelease> </PropertyGroup> <Import Project="..\..\PCBuild\python.props" /> @@ -26,10 +27,11 @@ <PythonArguments>$(PythonArguments) -s "$(PySourcePath.Trim('\'))" -t "$(IntermediateOutputPath)" -a $(ArchName)</PythonArguments> <PipArguments>"$(IntermediateOutputPath)\python.exe" -B -c "import sys; sys.path.append(r'$(PySourcePath)\Lib'); import ensurepip; ensurepip._main()"</PipArguments> + <PackageArguments Condition="$(Packages) != ''">"$(IntermediateOutputPath)\python.exe" -B -m pip install -U $(Packages)</PackageArguments> <NugetArguments>"$(Nuget)" pack "$(MSBuildThisFileDirectory)\$(OutputName).nuspec"</NugetArguments> <NugetArguments>$(NugetArguments) -BasePath "$(IntermediateOutputPath)"</NugetArguments> - <NugetArguments>$(NugetArguments) -OutputDirectory "$(OutputPath.Trim('\'))"</NugetArguments> + <NugetArguments>$(NugetArguments) -OutputDirectory "$(OutputPath.Trim(`\`))"</NugetArguments> <NugetArguments>$(NugetArguments) -Version "$(NuspecVersion)"</NugetArguments> <NugetArguments>$(NugetArguments) -NoPackageAnalysis -NonInteractive</NugetArguments> </PropertyGroup> @@ -42,6 +44,7 @@ <Exec Command="$(CleanCommand)" /> <Exec Command="$(PythonArguments)" /> <Exec Command="$(PipArguments)" /> + <Exec Command="$(PackageArguments)" Condition="$(PackageArguments) != ''" /> <Exec Command="$(NugetArguments)" /> </Target> diff --git a/Tools/nuget/make_zip.py b/Tools/nuget/make_zip.py --- a/Tools/nuget/make_zip.py +++ b/Tools/nuget/make_zip.py @@ -14,9 +14,19 @@ import subprocess TKTCL_RE = re.compile(r'^(_?tk|tcl).+\.(pyd|dll)', re.IGNORECASE) -DEBUG_RE = re.compile(r'_d\.(pyd|dll|exe)$', re.IGNORECASE) +DEBUG_RE = re.compile(r'_d\.(pyd|dll|exe|pdb|lib)$', re.IGNORECASE) PYTHON_DLL_RE = re.compile(r'python\d\d?\.dll$', re.IGNORECASE) +DEBUG_FILES = { + '_ctypes_test', + '_testbuffer', + '_testcapi', + '_testimportmultiple', + '_testmultiphase', + 'xxlimited', + 'python3_dstub', +} + EXCLUDE_FROM_LIBRARY = { '__pycache__', 'ensurepip', @@ -25,12 +35,19 @@ 'site-packages', 'tkinter', 'turtledemo', + 'venv', } EXCLUDE_FILE_FROM_LIBRARY = { 'bdist_wininst.py', } +EXCLUDE_FILE_FROM_LIBS = { + 'ssleay', + 'libeay', + 'python3stub', +} + def is_not_debug(p): if DEBUG_RE.search(p.name): return False @@ -38,14 +55,7 @@ if TKTCL_RE.search(p.name): return False - return p.name.lower() not in { - '_ctypes_test.pyd', - '_testbuffer.pyd', - '_testcapi.pyd', - '_testimportmultiple.pyd', - '_testmultiphase.pyd', - 'xxlimited.pyd', - } + return p.stem.lower() not in DEBUG_FILES def is_not_debug_or_python(p): return is_not_debug(p) and not PYTHON_DLL_RE.search(p.name) @@ -69,6 +79,12 @@ suffix = p.suffix.lower() return suffix not in {'.pyc', '.pyo', '.exe'} +def include_in_libs(p): + if not is_not_debug(p): + return False + + return p.stem.lower() not in EXCLUDE_FILE_FROM_LIBS + def include_in_tools(p): if p.is_dir() and p.name.lower() in {'scripts', 'i18n', 'pynche', 'demo', 'parser'}: return True @@ -84,6 +100,7 @@ ('include/', 'include', '*.h', None), ('include/', 'PC', 'pyconfig.h', None), ('Lib/', 'Lib', '**/*', include_in_lib), + ('libs/', 'PCBuild/$arch', '*.lib', include_in_libs), ('Tools/', 'Tools', '**/*', include_in_tools), ] @@ -160,7 +177,7 @@ source = ns.source or (Path(__file__).resolve().parent.parent.parent) out = ns.out - arch = "" if ns.arch == "win32" else ns.arch + arch = '' if ns.arch == 'win32' else ns.arch assert isinstance(source, Path) assert not out or isinstance(out, Path) assert isinstance(arch, str) -- Repository URL: https://hg.python.org/cpython

1 0