Mailman 3 October 2015 - Python-checkins

cpython (2.7): Backport early-out 91259f061cfb to reduce the cost of bb1a2944bcb6
by raymond.hettinger Nov. 12, 2015

Nov. 12, 2015

https://hg.python.org/cpython/rev/37aee118e1a3 changeset: 98578:37aee118e1a3 branch: 2.7 parent: 98572:60c44a09c5fc user: Raymond Hettinger <python(a)rcn.com> date: Tue Oct 06 23:12:02 2015 -0400 summary: Backport early-out 91259f061cfb to reduce the cost of bb1a2944bcb6 files: Modules/_collectionsmodule.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/Modules/_collectionsmodule.c b/Modules/_collectionsmodule.c --- a/Modules/_collectionsmodule.c +++ b/Modules/_collectionsmodule.c @@ -651,6 +651,9 @@ Py_ssize_t n; PyObject *item; + if (Py_SIZE(deque) == 0) + return; + /* During the process of clearing a deque, decrefs can cause the deque to mutate. To avoid fatal confusion, we have to make the deque empty before clearing the blocks and never refer to @@ -1083,7 +1086,8 @@ } } deque->maxlen = maxlen; - deque_clear(deque); + if (Py_SIZE(deque) > 0) + deque_clear(deque); if (iterable != NULL) { PyObject *rv = deque_extend(deque, iterable); if (rv == NULL) -- Repository URL: https://hg.python.org/cpython

3 3

cpython (3.5): Fix typo noticed by Alec Nunn
by berker.peksag Oct. 31, 2015

Oct. 31, 2015

https://hg.python.org/cpython/rev/f884590ee620 changeset: 98920:f884590ee620 branch: 3.5 parent: 98918:df12c29882b1 user: Berker Peksag <berker.peksag(a)gmail.com> date: Sun Nov 01 00:55:12 2015 +0300 summary: Fix typo noticed by Alec Nunn files: Doc/library/readline.rst | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Doc/library/readline.rst b/Doc/library/readline.rst --- a/Doc/library/readline.rst +++ b/Doc/library/readline.rst @@ -222,7 +222,7 @@ import atexit import os - import realine + import readline histfile = os.path.join(os.path.expanduser("~"), ".python_history") try: -- Repository URL: https://hg.python.org/cpython

1 0

cpython (merge 3.5 -> default): Fix typo noticed by Alec Nunn
by berker.peksag Oct. 31, 2015

Oct. 31, 2015

https://hg.python.org/cpython/rev/f7db966c9fee changeset: 98921:f7db966c9fee parent: 98919:9beeb4c1375d parent: 98920:f884590ee620 user: Berker Peksag <berker.peksag(a)gmail.com> date: Sun Nov 01 00:55:31 2015 +0300 summary: Fix typo noticed by Alec Nunn files: Doc/library/readline.rst | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Doc/library/readline.rst b/Doc/library/readline.rst --- a/Doc/library/readline.rst +++ b/Doc/library/readline.rst @@ -222,7 +222,7 @@ import atexit import os - import realine + import readline histfile = os.path.join(os.path.expanduser("~"), ".python_history") try: -- Repository URL: https://hg.python.org/cpython

1 0

cpython (3.5): Issue #25450: Updates shortcuts to start Python in installation directory.
by steve.dower Oct. 31, 2015

Oct. 31, 2015

https://hg.python.org/cpython/rev/df12c29882b1 changeset: 98918:df12c29882b1 branch: 3.5 user: Steve Dower <steve.dower(a)microsoft.com> date: Sat Oct 31 12:41:46 2015 -0700 summary: Issue #25450: Updates shortcuts to start Python in installation directory. files: Misc/NEWS | 2 ++ Tools/msi/doc/doc.wxs | 3 ++- Tools/msi/exe/exe.wxs | 3 ++- Tools/msi/tcltk/tcltk.wxs | 6 ++++-- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -348,6 +348,8 @@ Windows ------- +- Issue #25450: Updates shortcuts to start Python in installation directory. + - Issue #25164: Changes default all-users install directory to match per-user directory. diff --git a/Tools/msi/doc/doc.wxs b/Tools/msi/doc/doc.wxs --- a/Tools/msi/doc/doc.wxs +++ b/Tools/msi/doc/doc.wxs @@ -22,7 +22,8 @@ <Shortcut Id="python.chm" Target="[#python.chm]" Name="!(loc.ShortcutName)" - Description="!(loc.ShortcutDescription)" /> + Description="!(loc.ShortcutDescription)" + WorkingDirectory="InstallDirectory" /> <RemoveFolder Id="Remove_MenuDir" On="uninstall" /> </Component> <?endif ?> diff --git a/Tools/msi/exe/exe.wxs b/Tools/msi/exe/exe.wxs --- a/Tools/msi/exe/exe.wxs +++ b/Tools/msi/exe/exe.wxs @@ -20,7 +20,8 @@ <Shortcut Id="python.exe" Target="[#python.exe]" Name="!(loc.ShortcutName)" - Description="!(loc.ShortcutDescription)" /> + Description="!(loc.ShortcutDescription)" + WorkingDirectory="InstallDirectory" /> <RemoveFolder Id="Remove_MenuDir" Directory="MenuDir" On="uninstall" /> <RegistryKey Root="HKMU" Key="[REGISTRYKEY]"> <RegistryValue Key="InstallPath\InstallGroup" Type="string" Value="!(loc.ProductName)" KeyPath="yes" /> diff --git a/Tools/msi/tcltk/tcltk.wxs b/Tools/msi/tcltk/tcltk.wxs --- a/Tools/msi/tcltk/tcltk.wxs +++ b/Tools/msi/tcltk/tcltk.wxs @@ -49,7 +49,8 @@ Description="!(loc.ShortcutDescription)" Target="[PYTHONW_EXE]" Arguments='"[#Lib_idlelib_idle.pyw]"' - Icon="idle.exe"> + Icon="idle.exe" + WorkingDirectory="InstallDirectory"> <Icon Id="idle.exe" SourceFile="!(bindpath.src)Lib\idlelib\Icons\idle.ico" /> </Shortcut> <Shortcut Id="pydoc.py" @@ -57,7 +58,8 @@ Arguments='-m pydoc -b' Name="!(loc.PyDocShortcutName)" Description="!(loc.PyDocShortcutDescription)" - Icon="idle.exe" /> + Icon="idle.exe" + WorkingDirectory="InstallDirectory" /> </Component> </Feature> </Product> -- Repository URL: https://hg.python.org/cpython

1 0

cpython (merge 3.5 -> default): Merge from 3.5
by steve.dower Oct. 31, 2015

Oct. 31, 2015

https://hg.python.org/cpython/rev/9beeb4c1375d changeset: 98919:9beeb4c1375d parent: 98916:cc75b40a27ba parent: 98918:df12c29882b1 user: Steve Dower <steve.dower(a)microsoft.com> date: Sat Oct 31 13:07:44 2015 -0700 summary: Merge from 3.5 files: Misc/NEWS | 2 + PCbuild/build.bat | 3 + PCbuild/pyproject.props | 4 +- PCbuild/python.props | 16 +++++- Tools/msi/build.bat | 24 ++++++--- Tools/msi/bundle/Default.thm | 2 +- Tools/msi/bundle/bundle.targets | 8 ++- Tools/msi/bundle/bundle.wxs | 27 ++++++++--- Tools/msi/common.wxs | 4 +- Tools/msi/doc/doc.wxs | 3 +- Tools/msi/exe/exe.wxs | 3 +- Tools/msi/launcher/launcher_files.wxs | 8 +- Tools/msi/launcher/launcher_reg.wxs | 34 +++++++------- Tools/msi/msi.props | 8 +-- Tools/msi/msi.targets | 2 +- Tools/msi/tcltk/tcltk.wxs | 6 +- Tools/msi/tcltk/tcltk_reg.wxs | 16 +++--- 17 files changed, 103 insertions(+), 67 deletions(-) diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -519,6 +519,8 @@ Windows ------- +- Issue #25450: Updates shortcuts to start Python in installation directory. + - Issue #25164: Changes default all-users install directory to match per-user directory. diff --git a/PCbuild/build.bat b/PCbuild/build.bat --- a/PCbuild/build.bat +++ b/PCbuild/build.bat @@ -38,6 +38,7 @@ echo. Set the platform (default: Win32) echo. -t Build ^| Rebuild ^| Clean ^| CleanAll echo. Set the target manually +echo. --test-marker Enable the test marker within the build. exit /b 127 :Run @@ -62,6 +63,7 @@ if "%~1"=="-M" (set parallel=) & shift & goto CheckOpts if "%~1"=="-v" (set verbose=/v:n) & shift & goto CheckOpts if "%~1"=="-k" (set kill=true) & shift & goto CheckOpts +if "%~1"=="--test-marker" (set UseTestMarker=true) & shift & goto CheckOpts if "%~1"=="-V" shift & goto Version rem These use the actual property names used by MSBuild. We could just let rem them in through the environment, but we specify them on the command line @@ -93,6 +95,7 @@ /p:Configuration=%conf% /p:Platform=%platf%^ /p:IncludeExternals=%IncludeExternals%^ /p:IncludeSSL=%IncludeSSL% /p:IncludeTkinter=%IncludeTkinter%^ + /p:UseTestMarker=%UseTestMarker%^ %1 %2 %3 %4 %5 %6 %7 %8 %9 @goto :eof diff --git a/PCbuild/pyproject.props b/PCbuild/pyproject.props --- a/PCbuild/pyproject.props +++ b/PCbuild/pyproject.props @@ -128,8 +128,8 @@ </UsingTask> <Target Name="KillPython" BeforeTargets="PrepareForBuild" Condition="'$(KillPython)' == 'true'"> - <Message Text="Killing any running python.exe instances..." Importance="high" /> - <KillPython FileName="$(OutDir)python$(PyDebugExt).exe" /> + <Message Text="Killing any running python$(PyDebugExt)$(PyTestExt).exe instances..." Importance="high" /> + <KillPython FileName="$(OutDir)python$(PyDebugExt)$(PyTestExt).exe" /> </Target>  <PyDebugExt Condition="'$(PyDebugExt)' == '' and $(Configuration) == 'Debug'">_d</PyDebugExt> +  + <PyTestExt Condition="$(UseTestMarker) == 'true'">-test</PyTestExt> + +  + <PyArchExt Condition="'$(ArchName)' == 'win32'">-32</PyArchExt> +  <PythonExe Condition="'$(PythonExe)' == ''">$(BuildPath)python$(PyDebugExt).exe</PythonExe> </PropertyGroup> @@ -129,17 +135,17 @@ $([msbuild]::Multiply($(MicroVersionNumber), 1000)) )) ))</Field3Value> + <Field3Value Condition="$(UseTestMarker) == 'true'">$([msbuild]::Add($(Field3Value), 9000))</Field3Value>  <PyDllName>python$(MajorVersionNumber)$(MinorVersionNumber)$(PyDebugExt)</PyDllName>  - <PydTag Condition="$(Platform) == 'Win32' or $(Platform) == 'x86'">.cp$(MajorVersionNumber)$(MinorVersionNumber)-win32</PydTag> - <PydTag Condition="$(Platform) == 'x64'">.cp$(MajorVersionNumber)$(MinorVersionNumber)-win_amd64</PydTag> + <PydTag Condition="$(ArchName) == 'win32'">.cp$(MajorVersionNumber)$(MinorVersionNumber)-win32</PydTag> + <PydTag Condition="$(ArchName) == 'amd64'">.cp$(MajorVersionNumber)$(MinorVersionNumber)-win_amd64</PydTag>  - <SysWinVer>$(MajorVersionNumber).$(MinorVersionNumber)</SysWinVer> - <SysWinVer Condition="$(Platform) == 'Win32' or $(Platform) == 'x86'">$(SysWinVer)-32</SysWinVer> + <SysWinVer>$(MajorVersionNumber).$(MinorVersionNumber)$(PyArchExt)$(PyTestExt)</SysWinVer> </PropertyGroup>  @@ -148,5 +154,7 @@ <Message Importance="high" Text="PythonVersion: $(PythonVersion)" /> <Message Importance="high" Text="PythonVersionHex: 0x$([System.UInt32]::Parse($(PythonVersionHex)).ToString(`X08`))" /> <Message Importance="high" Text="Field3Value: $(Field3Value)" /> + <Message Importance="high" Text="SysWinVer: $(SysWinVer)" /> + <Message Importance="high" Text="PyDllName: $(PyDllName)" /> </Target> </Project> diff --git a/Tools/msi/build.bat b/Tools/msi/build.bat --- a/Tools/msi/build.bat +++ b/Tools/msi/build.bat @@ -6,16 +6,18 @@ set BUILDX86= set BUILDX64= set BUILDDOC= -set BUILDPX= +set BUILDTEST=--test-marker set BUILDPACK= +set REBUILD= :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 "--doc" (set BUILDDOC=1) && shift && goto CheckOpts -if "%~1" EQU "--test-marker" (set BUILDPX=1) && shift && goto CheckOpts +if "%~1" EQU "--no-test-marker" (set BUILDTEST=) && shift && goto CheckOpts if "%~1" EQU "--pack" (set BUILDPACK=1) && shift && goto CheckOpts +if "%~1" EQU "-r" (set REBUILD=-r) && shift && goto CheckOpts if not defined BUILDX86 if not defined BUILDX64 (set BUILDX86=1) && (set BUILDX64=1) @@ -24,15 +26,15 @@ call "%PCBUILD%env.bat" x86 if defined BUILDX86 ( - call "%PCBUILD%build.bat" -d -e + call "%PCBUILD%build.bat" -d -e %REBUILD% %BUILDTEST% if errorlevel 1 goto :eof - call "%PCBUILD%build.bat" -e + call "%PCBUILD%build.bat" -e %REBUILD% %BUILDTEST% if errorlevel 1 goto :eof ) if defined BUILDX64 ( - call "%PCBUILD%build.bat" -p x64 -d -e + call "%PCBUILD%build.bat" -p x64 -d -e %REBUILD% %BUILDTEST% if errorlevel 1 goto :eof - call "%PCBUILD%build.bat" -p x64 -e + call "%PCBUILD%build.bat" -p x64 -e %REBUILD% %BUILDTEST% if errorlevel 1 goto :eof ) @@ -42,12 +44,15 @@ ) set BUILD_CMD="%D%bundle\snapshot.wixproj" -if defined BUILDPX ( +if defined BUILDTEST ( set BUILD_CMD=%BUILD_CMD% /p:UseTestMarker=true ) if defined BUILDPACK ( set BUILD_CMD=%BUILD_CMD% /p:Pack=true ) +if defined REBUILD ( + set BUILD_CMD=%BUILD_CMD% /t:Rebuild +) if defined BUILDX86 ( msbuild %BUILD_CMD% @@ -61,10 +66,11 @@ exit /B 0 :Help -echo build.bat [-x86] [-x64] [--doc] [-h] [--test-marker] [--pack] +echo build.bat [-x86] [-x64] [--doc] [-h] [--no-test-marker] [--pack] [-r] echo. echo -x86 Build x86 installers echo -x64 Build x64 installers echo --doc Build CHM documentation -echo --test-marker Build installers with 'x' markers +echo --no-test-marker Build without test markers echo --pack Embed core MSIs into installer +echo -r Rebuild rather than incremental build diff --git a/Tools/msi/bundle/Default.thm b/Tools/msi/bundle/Default.thm --- a/Tools/msi/bundle/Default.thm +++ b/Tools/msi/bundle/Default.thm @@ -64,7 +64,7 @@ <Checkbox Name="Include_test" X="185" Y="201" Width="-11" Height="24" TabStop="yes" FontId="3" HideWhenDisabled="yes">#(loc.Include_testLabel)</Checkbox> <Text X="205" Y="226" Width="-11" Height="24" TabStop="no" FontId="5">#(loc.Include_testHelpLabel)</Text> - <Checkbox Name="Include_launcher" X="185" Y="251" Width="100" Height="24" TabStop="yes" FontId="3" HideWhenDisabled="yes">#(loc.Include_launcherLabel)</Checkbox> + <Checkbox Name="Include_launcher" X="185" Y="251" Width="100" Height="24" TabStop="yes" FontId="3" HideWhenDisabled="no">#(loc.Include_launcherLabel)</Checkbox> <Checkbox Name="CustomInstallLauncherAllUsers" X="285" Y="251" Width="-11" Height="24" TabStop="yes" FontId="3">#(loc.InstallLauncherAllUsersLabel)</Checkbox> <Text X="205" Y="276" Width="-11" Height="24" TabStop="no" FontId="5">#(loc.Include_launcherHelpLabel)</Text> diff --git a/Tools/msi/bundle/bundle.targets b/Tools/msi/bundle/bundle.targets --- a/Tools/msi/bundle/bundle.targets +++ b/Tools/msi/bundle/bundle.targets @@ -88,8 +88,12 @@ </Target> <Target Name="BuildLauncher" BeforeTargets="BeforeBuild" Condition="'$(RebuildAll)' != 'false'"> -  - <Exec Command='msbuild ..\launcher\launcher.wixproj /p:Platform=x86 /p:ReleaseUri="$(ReleaseUri)" /p:OutputPath="$(BuildPath.TrimEnd(`\`))" /p:OutputSuffix=$(Platform) /p:BuildForRelease=$(BuildForRelease) /p:UseTestMarker=$(UseTestMarker)' +  + <Exec Command='msbuild ..\launcher\launcher.wixproj /p:Platform=x86 /p:ReleaseUri="$(ReleaseUri)" /p:OutputPath="$(BuildPath.TrimEnd(`\`))" /p:OutputSuffix=$(Platform) /p:BuildForRelease=$(BuildForRelease) /p:UseTestMarker=false' ContinueOnError="false" /> </Target> diff --git a/Tools/msi/bundle/bundle.wxs b/Tools/msi/bundle/bundle.wxs --- a/Tools/msi/bundle/bundle.wxs +++ b/Tools/msi/bundle/bundle.wxs @@ -22,22 +22,26 @@ <Variable Name="ShortVersion" Value="$(var.MajorVersionNumber).$(var.MinorVersionNumber)" /> <Variable Name="ShortVersionNoDot" Value="$(var.MajorVersionNumber)$(var.MinorVersionNumber)" /> - <Variable Name="WinVer" Value="$(var.MajorVersionNumber).$(var.MinorVersionNumber)$(var.Suffix32)" /> - <Variable Name="WinVerNoDot" Value="$(var.MajorVersionNumber)$(var.MinorVersionNumber)$(var.Suffix32)" /> + <Variable Name="WinVer" Value="$(var.MajorVersionNumber).$(var.MinorVersionNumber)$(var.PyArchExt)$(var.PyTestExt)" /> + <Variable Name="WinVerNoDot" Value="$(var.MajorVersionNumber)$(var.MinorVersionNumber)$(var.PyArchExt)$(var.PyTestExt)" /> <Variable Name="InstallAllUsers" Value="0" bal:Overridable="yes" /> + <?ifndef PyTestExt ?> <Variable Name="InstallLauncherAllUsers" Value="1" bal:Overridable="yes" /> + <?else ?> + <Variable Name="InstallLauncherAllUsers" Value="0" /> + <?endif ?> <Variable Name="TargetDir" Value="" bal:Overridable="yes" /> <?if $(var.Platform)~="x64" ?> - <Variable Name="DefaultAllUsersTargetDir" Value="[ProgramFiles64Folder]$(var.TestPrefix)Python[WinVerNoDot]" bal:Overridable="yes" /> + <Variable Name="DefaultAllUsersTargetDir" Value="[ProgramFiles64Folder]Python[WinVerNoDot]" bal:Overridable="yes" /> <Variable Name="TargetPlatform" Value="x64" /> <?else ?> - <Variable Name="DefaultAllUsersTargetDir" Value="[ProgramFilesFolder]$(var.TestPrefix)Python[WinVerNoDot]" bal:Overridable="yes" /> + <Variable Name="DefaultAllUsersTargetDir" Value="[ProgramFilesFolder]Python[WinVerNoDot]" bal:Overridable="yes" /> <Variable Name="TargetPlatform" Value="x86" /> <?endif ?> - <Variable Name="DefaultJustForMeTargetDir" Value="[LocalAppDataFolder]Programs\$(var.TestPrefix)Python\Python[WinVerNoDot]" bal:Overridable="yes" /> - <Variable Name="OptionalFeaturesRegistryKey" Value="Software\$(var.TestPrefix)Python\PythonCore\[WinVer]\InstalledFeatures" /> - <Variable Name="TargetDirRegistryKey" Value="Software\$(var.TestPrefix)Python\PythonCore\[WinVer]\InstallPath" /> + <Variable Name="DefaultJustForMeTargetDir" Value="[LocalAppDataFolder]Programs\Python\Python[WinVerNoDot]" bal:Overridable="yes" /> + <Variable Name="OptionalFeaturesRegistryKey" Value="Software\Python\PythonCore\[WinVer]\InstalledFeatures" /> + <Variable Name="TargetDirRegistryKey" Value="Software\Python\PythonCore\[WinVer]\InstallPath" />  <Component Id="assoc_subcommands" Directory="InstallDirectory" Guid="{57D47B4C-96E6-40A0-A958-57083D74423F}"> <Condition>VersionNT > 600</Condition> - <RegistryValue Root="HKCR" Key="$(var.TestPrefix)Python.File\Shell\editwithidle" Name="MUIVerb" Value="!(loc.EditMenu)" Type="string" KeyPath="yes" /> - <RegistryValue Root="HKCR" Key="$(var.TestPrefix)Python.File\Shell\editwithidle" Name="Subcommands" Value="" Type="string" KeyPath="no" /> + <RegistryValue Root="HKCR" Key="Python.File\Shell\editwithidle$(var.PyTestExt)" Name="MUIVerb" Value="!(loc.EditMenu)" Type="string" KeyPath="yes" /> + <RegistryValue Root="HKCR" Key="Python.File\Shell\editwithidle$(var.PyTestExt)" Name="Subcommands" Value="" Type="string" KeyPath="no" /> </Component> <Component Id="assoc_subcommands_nocon" Directory="InstallDirectory" Guid="{07061D85-9151-4FC4-BB78-13628020D026}"> <Condition>VersionNT > 600</Condition> - <RegistryValue Root="HKCR" Key="$(var.TestPrefix)Python.NoConFile\Shell\editwithidle" Name="MUIVerb" Value="!(loc.EditMenu)" Type="string" KeyPath="yes" /> - <RegistryValue Root="HKCR" Key="$(var.TestPrefix)Python.NoConFile\Shell\editwithidle" Name="Subcommands" Value="" Type="string" KeyPath="no" /> + <RegistryValue Root="HKCR" Key="Python.NoConFile\Shell\editwithidle$(var.PyTestExt)" Name="MUIVerb" Value="!(loc.EditMenu)" Type="string" KeyPath="yes" /> + <RegistryValue Root="HKCR" Key="Python.NoConFile\Shell\editwithidle$(var.PyTestExt)" Name="Subcommands" Value="" Type="string" KeyPath="no" /> </Component> <Component Id="assoc_editwithidle" Directory="InstallDirectory"> <Condition>VersionNT > 600</Condition> - <RegistryKey Root="HKCR" Key="$(var.TestPrefix)Python.File\Shell\editwithidle\shell\edit$(var.MajorVersionNumber)$(var.MinorVersionNumber)$(var.Suffix32)"> + <RegistryKey Root="HKCR" Key="Python.File\Shell\editwithidle\shell\edit$(var.MajorVersionNumber)$(var.MinorVersionNumber)$(var.PyArchExt)$(var.PyTestExt)"> <RegistryValue Name="MUIVerb" Value="!(loc.EditSubMenu)" Type="string" KeyPath="yes" /> <RegistryValue Key="command" Value='"[PYTHONW_EXE]" -m idlelib "%L" %*' Type="string" /> </RegistryKey> </Component> <Component Id="assoc_editwithidle_nocon" Directory="InstallDirectory"> <Condition>VersionNT > 600</Condition> - <RegistryKey Root="HKCR" Key="$(var.TestPrefix)Python.NoConFile\Shell\editwithidle\shell\edit$(var.MajorVersionNumber)$(var.MinorVersionNumber)$(var.Suffix32)"> + <RegistryKey Root="HKCR" Key="Python.NoConFile\Shell\editwithidle\shell\edit$(var.MajorVersionNumber)$(var.MinorVersionNumber)$(var.PyArchExt)$(var.PyTestExt)"> <RegistryValue Name="MUIVerb" Value="!(loc.EditSubMenu)" Type="string" KeyPath="yes" /> <RegistryValue Key="command" Value='"[PYTHONW_EXE]" -m idlelib "%L" %*' Type="string" /> </RegistryKey> @@ -31,14 +31,14 @@ <Component Id="assoc_editwithidle_vista" Directory="InstallDirectory"> <Condition>VersionNT = 600</Condition> - <RegistryKey Root="HKCR" Key="$(var.TestPrefix)Python.File\Shell\editwithidle$(var.MajorVersionNumber)$(var.MinorVersionNumber)$(var.Suffix32)"> + <RegistryKey Root="HKCR" Key="Python.File\Shell\editwithidle$(var.MajorVersionNumber)$(var.MinorVersionNumber)$(var.PyArchExt)$(var.PyTestExt)"> <RegistryValue Value="!(loc.EditSubMenu)" Type="string" KeyPath="yes" /> <RegistryValue Key="command" Value='"[PYTHONW_EXE]" -m idlelib "%L" %*' Type="string" /> </RegistryKey> </Component> <Component Id="assoc_editwithidle_nocon_vista" Directory="InstallDirectory"> <Condition>VersionNT = 600</Condition> - <RegistryKey Root="HKCR" Key="$(var.TestPrefix)Python.NoConFile\Shell\editwithidle$(var.MajorVersionNumber)$(var.MinorVersionNumber)$(var.Suffix32)"> + <RegistryKey Root="HKCR" Key="Python.NoConFile\Shell\editwithidle$(var.MajorVersionNumber)$(var.MinorVersionNumber)$(var.PyArchExt)$(var.PyTestExt)"> <RegistryValue Value="!(loc.EditSubMenu)" Type="string" KeyPath="yes" /> <RegistryValue Key="command" Value='"[PYTHONW_EXE]" -m idlelib "%L" %*' Type="string" /> </RegistryKey> -- Repository URL: https://hg.python.org/cpython

1 0

cpython (3.5): Improves handling of test markers for building Python without intefering with
by steve.dower Oct. 31, 2015

Oct. 31, 2015

https://hg.python.org/cpython/rev/2bfa1ddc8166 changeset: 98917:2bfa1ddc8166 branch: 3.5 parent: 98915:31397c0ef97a user: Steve Dower <steve.dower(a)microsoft.com> date: Sat Oct 31 12:17:11 2015 -0700 summary: Improves handling of test markers for building Python without intefering with actual installs. files: PCbuild/build.bat | 3 + PCbuild/pyproject.props | 4 +- PCbuild/python.props | 16 +++++- Tools/msi/build.bat | 24 ++++++--- Tools/msi/bundle/Default.thm | 2 +- Tools/msi/bundle/bundle.targets | 8 ++- Tools/msi/bundle/bundle.wxs | 27 ++++++++--- Tools/msi/common.wxs | 4 +- Tools/msi/launcher/launcher_files.wxs | 8 +- Tools/msi/launcher/launcher_reg.wxs | 34 +++++++------- Tools/msi/msi.props | 8 +-- Tools/msi/msi.targets | 2 +- Tools/msi/tcltk/tcltk_reg.wxs | 16 +++--- 13 files changed, 93 insertions(+), 63 deletions(-) diff --git a/PCbuild/build.bat b/PCbuild/build.bat --- a/PCbuild/build.bat +++ b/PCbuild/build.bat @@ -38,6 +38,7 @@ echo. Set the platform (default: Win32) echo. -t Build ^| Rebuild ^| Clean ^| CleanAll echo. Set the target manually +echo. --test-marker Enable the test marker within the build. exit /b 127 :Run @@ -62,6 +63,7 @@ if "%~1"=="-M" (set parallel=) & shift & goto CheckOpts if "%~1"=="-v" (set verbose=/v:n) & shift & goto CheckOpts if "%~1"=="-k" (set kill=true) & shift & goto CheckOpts +if "%~1"=="--test-marker" (set UseTestMarker=true) & shift & goto CheckOpts if "%~1"=="-V" shift & goto Version rem These use the actual property names used by MSBuild. We could just let rem them in through the environment, but we specify them on the command line @@ -93,6 +95,7 @@ /p:Configuration=%conf% /p:Platform=%platf%^ /p:IncludeExternals=%IncludeExternals%^ /p:IncludeSSL=%IncludeSSL% /p:IncludeTkinter=%IncludeTkinter%^ + /p:UseTestMarker=%UseTestMarker%^ %1 %2 %3 %4 %5 %6 %7 %8 %9 @goto :eof diff --git a/PCbuild/pyproject.props b/PCbuild/pyproject.props --- a/PCbuild/pyproject.props +++ b/PCbuild/pyproject.props @@ -128,8 +128,8 @@ </UsingTask> <Target Name="KillPython" BeforeTargets="PrepareForBuild" Condition="'$(KillPython)' == 'true'"> - <Message Text="Killing any running python.exe instances..." Importance="high" /> - <KillPython FileName="$(OutDir)python$(PyDebugExt).exe" /> + <Message Text="Killing any running python$(PyDebugExt)$(PyTestExt).exe instances..." Importance="high" /> + <KillPython FileName="$(OutDir)python$(PyDebugExt)$(PyTestExt).exe" /> </Target>  <PyDebugExt Condition="'$(PyDebugExt)' == '' and $(Configuration) == 'Debug'">_d</PyDebugExt> +  + <PyTestExt Condition="$(UseTestMarker) == 'true'">-test</PyTestExt> + +  + <PyArchExt Condition="'$(ArchName)' == 'win32'">-32</PyArchExt> +  <PythonExe Condition="'$(PythonExe)' == ''">$(BuildPath)python$(PyDebugExt).exe</PythonExe> </PropertyGroup> @@ -129,17 +135,17 @@ $([msbuild]::Multiply($(MicroVersionNumber), 1000)) )) ))</Field3Value> + <Field3Value Condition="$(UseTestMarker) == 'true'">$([msbuild]::Add($(Field3Value), 9000))</Field3Value>  <PyDllName>python$(MajorVersionNumber)$(MinorVersionNumber)$(PyDebugExt)</PyDllName>  - <PydTag Condition="$(Platform) == 'Win32' or $(Platform) == 'x86'">.cp$(MajorVersionNumber)$(MinorVersionNumber)-win32</PydTag> - <PydTag Condition="$(Platform) == 'x64'">.cp$(MajorVersionNumber)$(MinorVersionNumber)-win_amd64</PydTag> + <PydTag Condition="$(ArchName) == 'win32'">.cp$(MajorVersionNumber)$(MinorVersionNumber)-win32</PydTag> + <PydTag Condition="$(ArchName) == 'amd64'">.cp$(MajorVersionNumber)$(MinorVersionNumber)-win_amd64</PydTag>  - <SysWinVer>$(MajorVersionNumber).$(MinorVersionNumber)</SysWinVer> - <SysWinVer Condition="$(Platform) == 'Win32' or $(Platform) == 'x86'">$(SysWinVer)-32</SysWinVer> + <SysWinVer>$(MajorVersionNumber).$(MinorVersionNumber)$(PyArchExt)$(PyTestExt)</SysWinVer> </PropertyGroup>  @@ -148,5 +154,7 @@ <Message Importance="high" Text="PythonVersion: $(PythonVersion)" /> <Message Importance="high" Text="PythonVersionHex: 0x$([System.UInt32]::Parse($(PythonVersionHex)).ToString(`X08`))" /> <Message Importance="high" Text="Field3Value: $(Field3Value)" /> + <Message Importance="high" Text="SysWinVer: $(SysWinVer)" /> + <Message Importance="high" Text="PyDllName: $(PyDllName)" /> </Target> </Project> diff --git a/Tools/msi/build.bat b/Tools/msi/build.bat --- a/Tools/msi/build.bat +++ b/Tools/msi/build.bat @@ -6,16 +6,18 @@ set BUILDX86= set BUILDX64= set BUILDDOC= -set BUILDPX= +set BUILDTEST=--test-marker set BUILDPACK= +set REBUILD= :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 "--doc" (set BUILDDOC=1) && shift && goto CheckOpts -if "%~1" EQU "--test-marker" (set BUILDPX=1) && shift && goto CheckOpts +if "%~1" EQU "--no-test-marker" (set BUILDTEST=) && shift && goto CheckOpts if "%~1" EQU "--pack" (set BUILDPACK=1) && shift && goto CheckOpts +if "%~1" EQU "-r" (set REBUILD=-r) && shift && goto CheckOpts if not defined BUILDX86 if not defined BUILDX64 (set BUILDX86=1) && (set BUILDX64=1) @@ -24,15 +26,15 @@ call "%PCBUILD%env.bat" x86 if defined BUILDX86 ( - call "%PCBUILD%build.bat" -d -e + call "%PCBUILD%build.bat" -d -e %REBUILD% %BUILDTEST% if errorlevel 1 goto :eof - call "%PCBUILD%build.bat" -e + call "%PCBUILD%build.bat" -e %REBUILD% %BUILDTEST% if errorlevel 1 goto :eof ) if defined BUILDX64 ( - call "%PCBUILD%build.bat" -p x64 -d -e + call "%PCBUILD%build.bat" -p x64 -d -e %REBUILD% %BUILDTEST% if errorlevel 1 goto :eof - call "%PCBUILD%build.bat" -p x64 -e + call "%PCBUILD%build.bat" -p x64 -e %REBUILD% %BUILDTEST% if errorlevel 1 goto :eof ) @@ -42,12 +44,15 @@ ) set BUILD_CMD="%D%bundle\snapshot.wixproj" -if defined BUILDPX ( +if defined BUILDTEST ( set BUILD_CMD=%BUILD_CMD% /p:UseTestMarker=true ) if defined BUILDPACK ( set BUILD_CMD=%BUILD_CMD% /p:Pack=true ) +if defined REBUILD ( + set BUILD_CMD=%BUILD_CMD% /t:Rebuild +) if defined BUILDX86 ( msbuild %BUILD_CMD% @@ -61,10 +66,11 @@ exit /B 0 :Help -echo build.bat [-x86] [-x64] [--doc] [-h] [--test-marker] [--pack] +echo build.bat [-x86] [-x64] [--doc] [-h] [--no-test-marker] [--pack] [-r] echo. echo -x86 Build x86 installers echo -x64 Build x64 installers echo --doc Build CHM documentation -echo --test-marker Build installers with 'x' markers +echo --no-test-marker Build without test markers echo --pack Embed core MSIs into installer +echo -r Rebuild rather than incremental build diff --git a/Tools/msi/bundle/Default.thm b/Tools/msi/bundle/Default.thm --- a/Tools/msi/bundle/Default.thm +++ b/Tools/msi/bundle/Default.thm @@ -64,7 +64,7 @@ <Checkbox Name="Include_test" X="185" Y="201" Width="-11" Height="24" TabStop="yes" FontId="3" HideWhenDisabled="yes">#(loc.Include_testLabel)</Checkbox> <Text X="205" Y="226" Width="-11" Height="24" TabStop="no" FontId="5">#(loc.Include_testHelpLabel)</Text> - <Checkbox Name="Include_launcher" X="185" Y="251" Width="100" Height="24" TabStop="yes" FontId="3" HideWhenDisabled="yes">#(loc.Include_launcherLabel)</Checkbox> + <Checkbox Name="Include_launcher" X="185" Y="251" Width="100" Height="24" TabStop="yes" FontId="3" HideWhenDisabled="no">#(loc.Include_launcherLabel)</Checkbox> <Checkbox Name="CustomInstallLauncherAllUsers" X="285" Y="251" Width="-11" Height="24" TabStop="yes" FontId="3">#(loc.InstallLauncherAllUsersLabel)</Checkbox> <Text X="205" Y="276" Width="-11" Height="24" TabStop="no" FontId="5">#(loc.Include_launcherHelpLabel)</Text> diff --git a/Tools/msi/bundle/bundle.targets b/Tools/msi/bundle/bundle.targets --- a/Tools/msi/bundle/bundle.targets +++ b/Tools/msi/bundle/bundle.targets @@ -88,8 +88,12 @@ </Target> <Target Name="BuildLauncher" BeforeTargets="BeforeBuild" Condition="'$(RebuildAll)' != 'false'"> -  - <Exec Command='msbuild ..\launcher\launcher.wixproj /p:Platform=x86 /p:ReleaseUri="$(ReleaseUri)" /p:OutputPath="$(BuildPath.TrimEnd(`\`))" /p:OutputSuffix=$(Platform) /p:BuildForRelease=$(BuildForRelease) /p:UseTestMarker=$(UseTestMarker)' +  + <Exec Command='msbuild ..\launcher\launcher.wixproj /p:Platform=x86 /p:ReleaseUri="$(ReleaseUri)" /p:OutputPath="$(BuildPath.TrimEnd(`\`))" /p:OutputSuffix=$(Platform) /p:BuildForRelease=$(BuildForRelease) /p:UseTestMarker=false' ContinueOnError="false" /> </Target> diff --git a/Tools/msi/bundle/bundle.wxs b/Tools/msi/bundle/bundle.wxs --- a/Tools/msi/bundle/bundle.wxs +++ b/Tools/msi/bundle/bundle.wxs @@ -22,22 +22,26 @@ <Variable Name="ShortVersion" Value="$(var.MajorVersionNumber).$(var.MinorVersionNumber)" /> <Variable Name="ShortVersionNoDot" Value="$(var.MajorVersionNumber)$(var.MinorVersionNumber)" /> - <Variable Name="WinVer" Value="$(var.MajorVersionNumber).$(var.MinorVersionNumber)$(var.Suffix32)" /> - <Variable Name="WinVerNoDot" Value="$(var.MajorVersionNumber)$(var.MinorVersionNumber)$(var.Suffix32)" /> + <Variable Name="WinVer" Value="$(var.MajorVersionNumber).$(var.MinorVersionNumber)$(var.PyArchExt)$(var.PyTestExt)" /> + <Variable Name="WinVerNoDot" Value="$(var.MajorVersionNumber)$(var.MinorVersionNumber)$(var.PyArchExt)$(var.PyTestExt)" /> <Variable Name="InstallAllUsers" Value="0" bal:Overridable="yes" /> + <?ifndef PyTestExt ?> <Variable Name="InstallLauncherAllUsers" Value="1" bal:Overridable="yes" /> + <?else ?> + <Variable Name="InstallLauncherAllUsers" Value="0" /> + <?endif ?> <Variable Name="TargetDir" Value="" bal:Overridable="yes" /> <?if $(var.Platform)~="x64" ?> - <Variable Name="DefaultAllUsersTargetDir" Value="[ProgramFiles64Folder]$(var.TestPrefix)Python[WinVerNoDot]" bal:Overridable="yes" /> + <Variable Name="DefaultAllUsersTargetDir" Value="[ProgramFiles64Folder]Python[WinVerNoDot]" bal:Overridable="yes" /> <Variable Name="TargetPlatform" Value="x64" /> <?else ?> - <Variable Name="DefaultAllUsersTargetDir" Value="[ProgramFilesFolder]$(var.TestPrefix)Python[WinVerNoDot]" bal:Overridable="yes" /> + <Variable Name="DefaultAllUsersTargetDir" Value="[ProgramFilesFolder]Python[WinVerNoDot]" bal:Overridable="yes" /> <Variable Name="TargetPlatform" Value="x86" /> <?endif ?> - <Variable Name="DefaultJustForMeTargetDir" Value="[LocalAppDataFolder]Programs\$(var.TestPrefix)Python\Python[WinVerNoDot]" bal:Overridable="yes" /> - <Variable Name="OptionalFeaturesRegistryKey" Value="Software\$(var.TestPrefix)Python\PythonCore\[WinVer]\InstalledFeatures" /> - <Variable Name="TargetDirRegistryKey" Value="Software\$(var.TestPrefix)Python\PythonCore\[WinVer]\InstallPath" /> + <Variable Name="DefaultJustForMeTargetDir" Value="[LocalAppDataFolder]Programs\Python\Python[WinVerNoDot]" bal:Overridable="yes" /> + <Variable Name="OptionalFeaturesRegistryKey" Value="Software\Python\PythonCore\[WinVer]\InstalledFeatures" /> + <Variable Name="TargetDirRegistryKey" Value="Software\Python\PythonCore\[WinVer]\InstallPath" />  <Component Id="assoc_subcommands" Directory="InstallDirectory" Guid="{57D47B4C-96E6-40A0-A958-57083D74423F}"> <Condition>VersionNT > 600</Condition> - <RegistryValue Root="HKCR" Key="$(var.TestPrefix)Python.File\Shell\editwithidle" Name="MUIVerb" Value="!(loc.EditMenu)" Type="string" KeyPath="yes" /> - <RegistryValue Root="HKCR" Key="$(var.TestPrefix)Python.File\Shell\editwithidle" Name="Subcommands" Value="" Type="string" KeyPath="no" /> + <RegistryValue Root="HKCR" Key="Python.File\Shell\editwithidle$(var.PyTestExt)" Name="MUIVerb" Value="!(loc.EditMenu)" Type="string" KeyPath="yes" /> + <RegistryValue Root="HKCR" Key="Python.File\Shell\editwithidle$(var.PyTestExt)" Name="Subcommands" Value="" Type="string" KeyPath="no" /> </Component> <Component Id="assoc_subcommands_nocon" Directory="InstallDirectory" Guid="{07061D85-9151-4FC4-BB78-13628020D026}"> <Condition>VersionNT > 600</Condition> - <RegistryValue Root="HKCR" Key="$(var.TestPrefix)Python.NoConFile\Shell\editwithidle" Name="MUIVerb" Value="!(loc.EditMenu)" Type="string" KeyPath="yes" /> - <RegistryValue Root="HKCR" Key="$(var.TestPrefix)Python.NoConFile\Shell\editwithidle" Name="Subcommands" Value="" Type="string" KeyPath="no" /> + <RegistryValue Root="HKCR" Key="Python.NoConFile\Shell\editwithidle$(var.PyTestExt)" Name="MUIVerb" Value="!(loc.EditMenu)" Type="string" KeyPath="yes" /> + <RegistryValue Root="HKCR" Key="Python.NoConFile\Shell\editwithidle$(var.PyTestExt)" Name="Subcommands" Value="" Type="string" KeyPath="no" /> </Component> <Component Id="assoc_editwithidle" Directory="InstallDirectory"> <Condition>VersionNT > 600</Condition> - <RegistryKey Root="HKCR" Key="$(var.TestPrefix)Python.File\Shell\editwithidle\shell\edit$(var.MajorVersionNumber)$(var.MinorVersionNumber)$(var.Suffix32)"> + <RegistryKey Root="HKCR" Key="Python.File\Shell\editwithidle\shell\edit$(var.MajorVersionNumber)$(var.MinorVersionNumber)$(var.PyArchExt)$(var.PyTestExt)"> <RegistryValue Name="MUIVerb" Value="!(loc.EditSubMenu)" Type="string" KeyPath="yes" /> <RegistryValue Key="command" Value='"[PYTHONW_EXE]" -m idlelib "%L" %*' Type="string" /> </RegistryKey> </Component> <Component Id="assoc_editwithidle_nocon" Directory="InstallDirectory"> <Condition>VersionNT > 600</Condition> - <RegistryKey Root="HKCR" Key="$(var.TestPrefix)Python.NoConFile\Shell\editwithidle\shell\edit$(var.MajorVersionNumber)$(var.MinorVersionNumber)$(var.Suffix32)"> + <RegistryKey Root="HKCR" Key="Python.NoConFile\Shell\editwithidle\shell\edit$(var.MajorVersionNumber)$(var.MinorVersionNumber)$(var.PyArchExt)$(var.PyTestExt)"> <RegistryValue Name="MUIVerb" Value="!(loc.EditSubMenu)" Type="string" KeyPath="yes" /> <RegistryValue Key="command" Value='"[PYTHONW_EXE]" -m idlelib "%L" %*' Type="string" /> </RegistryKey> @@ -31,14 +31,14 @@ <Component Id="assoc_editwithidle_vista" Directory="InstallDirectory"> <Condition>VersionNT = 600</Condition> - <RegistryKey Root="HKCR" Key="$(var.TestPrefix)Python.File\Shell\editwithidle$(var.MajorVersionNumber)$(var.MinorVersionNumber)$(var.Suffix32)"> + <RegistryKey Root="HKCR" Key="Python.File\Shell\editwithidle$(var.MajorVersionNumber)$(var.MinorVersionNumber)$(var.PyArchExt)$(var.PyTestExt)"> <RegistryValue Value="!(loc.EditSubMenu)" Type="string" KeyPath="yes" /> <RegistryValue Key="command" Value='"[PYTHONW_EXE]" -m idlelib "%L" %*' Type="string" /> </RegistryKey> </Component> <Component Id="assoc_editwithidle_nocon_vista" Directory="InstallDirectory"> <Condition>VersionNT = 600</Condition> - <RegistryKey Root="HKCR" Key="$(var.TestPrefix)Python.NoConFile\Shell\editwithidle$(var.MajorVersionNumber)$(var.MinorVersionNumber)$(var.Suffix32)"> + <RegistryKey Root="HKCR" Key="Python.NoConFile\Shell\editwithidle$(var.MajorVersionNumber)$(var.MinorVersionNumber)$(var.PyArchExt)$(var.PyTestExt)"> <RegistryValue Value="!(loc.EditSubMenu)" Type="string" KeyPath="yes" /> <RegistryValue Key="command" Value='"[PYTHONW_EXE]" -m idlelib "%L" %*' Type="string" /> </RegistryKey> -- Repository URL: https://hg.python.org/cpython

1 0

cpython (merge 3.5 -> default): Merge 3.5
by yury.selivanov Oct. 31, 2015

Oct. 31, 2015

https://hg.python.org/cpython/rev/cc75b40a27ba changeset: 98916:cc75b40a27ba parent: 98914:12e4145fc00b parent: 98915:31397c0ef97a user: Yury Selivanov <yselivanov(a)sprymix.com> date: Sat Oct 31 13:34:01 2015 -0400 summary: Merge 3.5 files: Doc/whatsnew/3.5.rst | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Doc/whatsnew/3.5.rst b/Doc/whatsnew/3.5.rst --- a/Doc/whatsnew/3.5.rst +++ b/Doc/whatsnew/3.5.rst @@ -276,7 +276,7 @@ S = dot((dot(H, beta) - r).T, dot(inv(dot(dot(H, V), H.T)), dot(H, beta) - r)) -An upcoming release of NumPy 1.10 will add support for the new operator:: +NumPy 1.10 has support for the new operator:: >>> import numpy -- Repository URL: https://hg.python.org/cpython

1 0

cpython (3.5): whatsnew/3.5: NumPy 1.10 has been released
by yury.selivanov Oct. 31, 2015

Oct. 31, 2015

https://hg.python.org/cpython/rev/31397c0ef97a changeset: 98915:31397c0ef97a branch: 3.5 parent: 98913:d8256ba0914b user: Yury Selivanov <yselivanov(a)sprymix.com> date: Sat Oct 31 13:33:49 2015 -0400 summary: whatsnew/3.5: NumPy 1.10 has been released files: Doc/whatsnew/3.5.rst | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Doc/whatsnew/3.5.rst b/Doc/whatsnew/3.5.rst --- a/Doc/whatsnew/3.5.rst +++ b/Doc/whatsnew/3.5.rst @@ -276,7 +276,7 @@ S = dot((dot(H, beta) - r).T, dot(inv(dot(dot(H, V), H.T)), dot(H, beta) - r)) -An upcoming release of NumPy 1.10 will add support for the new operator:: +NumPy 1.10 has support for the new operator:: >>> import numpy -- Repository URL: https://hg.python.org/cpython

1 0

cpython (3.5): docs/inspect: Document __annotations__
by yury.selivanov Oct. 31, 2015

Oct. 31, 2015

https://hg.python.org/cpython/rev/d8256ba0914b changeset: 98913:d8256ba0914b branch: 3.5 parent: 98911:669fb11a4b5e user: Yury Selivanov <yselivanov(a)sprymix.com> date: Sat Oct 31 13:29:15 2015 -0400 summary: docs/inspect: Document __annotations__ files: Doc/library/inspect.rst | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/Doc/library/inspect.rst b/Doc/library/inspect.rst --- a/Doc/library/inspect.rst +++ b/Doc/library/inspect.rst @@ -88,6 +88,12 @@ | | __globals__ | global namespace in which | | | | this function was defined | +-----------+-----------------+---------------------------+ +| | __annotations__ | mapping of parameters | +| | | names to annotations; | +| | | ``"return"`` key is | +| | | reserved for return | +| | | annotations. | ++-----------+-----------------+---------------------------+ | traceback | tb_frame | frame object at this | | | | level | +-----------+-----------------+---------------------------+ -- Repository URL: https://hg.python.org/cpython

1 0

cpython (merge 3.5 -> default): Merge 3.5
by yury.selivanov Oct. 31, 2015

Oct. 31, 2015

https://hg.python.org/cpython/rev/12e4145fc00b changeset: 98914:12e4145fc00b parent: 98912:0e8743a6924e parent: 98913:d8256ba0914b user: Yury Selivanov <yselivanov(a)sprymix.com> date: Sat Oct 31 13:29:35 2015 -0400 summary: Merge 3.5 files: Doc/library/inspect.rst | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/Doc/library/inspect.rst b/Doc/library/inspect.rst --- a/Doc/library/inspect.rst +++ b/Doc/library/inspect.rst @@ -88,6 +88,12 @@ | | __globals__ | global namespace in which | | | | this function was defined | +-----------+-----------------+---------------------------+ +| | __annotations__ | mapping of parameters | +| | | names to annotations; | +| | | ``"return"`` key is | +| | | reserved for return | +| | | annotations. | ++-----------+-----------------+---------------------------+ | traceback | tb_frame | frame object at this | | | | level | +-----------+-----------------+---------------------------+ -- Repository URL: https://hg.python.org/cpython

1 0