Fix test__locale on Mac; platform.uname() does not have a structseq-type interface (yet).
diff --git a/Doc/library/email.headerregistry.rst b/Doc/library/email.headerregistry.rst
index af72b7c..c884159 100644
--- a/Doc/library/email.headerregistry.rst
+++ b/Doc/library/email.headerregistry.rst
@@ -16,7 +16,7 @@
necessary by the core developers.
.. versionadded:: 3.3
- as a :term:`provisional module <provisional package>`
+ as a :term:`provisional module <provisional package>`.
Headers are represented by customized subclasses of :class:`str`. The
particular class used to represent a given header is determined by the
diff --git a/Lib/test/test__locale.py b/Lib/test/test__locale.py
index dab1565..f7f1abd 100644
--- a/Lib/test/test__locale.py
+++ b/Lib/test/test__locale.py
@@ -12,7 +12,7 @@
from test.support import run_unittest
if uname()[0] == "Darwin":
- maj, min, mic = [int(part) for part in uname().release.split(".")]
+ maj, min, mic = [int(part) for part in uname()[2].split(".")]
if (maj, min, mic) < (8, 0, 0):
raise unittest.SkipTest("locale support broken for OS X < 10.4")
diff --git a/PCbuild/pyproject.props b/PCbuild/pyproject.props
index 8041a6d..4afbe3c 100644
--- a/PCbuild/pyproject.props
+++ b/PCbuild/pyproject.props
@@ -1,5 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup Condition="'$(Platform)'=='Win32'">
+ <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+ <OutDir>$(SolutionDir)</OutDir>
+ <IntDir>$(SolutionDir)$(PlatformName)-temp-$(Configuration)\$(ProjectName)\</IntDir>
+ <LinkIncremental>false</LinkIncremental>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Platform)'=='x64'">
+ <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+ <_PropertySheetDisplayName>amd64</_PropertySheetDisplayName>
+ <OutDir>$(SolutionDir)amd64\</OutDir>
+ <IntDir>$(SolutionDir)$(PlatformName)-temp-$(Configuration)\$(ProjectName)\</IntDir>
+ </PropertyGroup>
<PropertyGroup Label="UserMacros">
<PyDllName>python33$(PyDebugExt)</PyDllName>
<PythonExe>$(OutDir)python$(PyDebugExt).exe</PythonExe>
@@ -16,12 +28,6 @@
<tcltk64Lib>$(tcltk64Dir)\lib\tcl85.lib;$(tcltk64Dir)\lib\tk85.lib</tcltk64Lib>
<tcltk64LibDebug>$(tcltk64Dir)\lib\tcl85g.lib;$(tcltk64Dir)\lib\tk85g.lib</tcltk64LibDebug>
</PropertyGroup>
- <PropertyGroup>
- <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir>$(SolutionDir)</OutDir>
- <IntDir>$(SolutionDir)$(PlatformName)-temp-$(Configuration)\$(ProjectName)\</IntDir>
- <LinkIncremental>false</LinkIncremental>
- </PropertyGroup>
<ItemDefinitionGroup>
<ClCompile>
<Optimization>MaxSpeed</Optimization>
diff --git a/PCbuild/x64.props b/PCbuild/x64.props
index 4fb319b..289d95b 100644
--- a/PCbuild/x64.props
+++ b/PCbuild/x64.props
@@ -3,12 +3,6 @@
<PropertyGroup Label="UserMacros" Condition="'$(HOST_PYTHON)'!=''">
<PythonExe>$(HOST_PYTHON)</PythonExe>
</PropertyGroup>
- <PropertyGroup>
- <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <_PropertySheetDisplayName>amd64</_PropertySheetDisplayName>
- <OutDir>$(SolutionDir)amd64\</OutDir>
- <IntDir>$(SolutionDir)$(PlatformName)-temp-$(Configuration)\$(ProjectName)\</IntDir>
- </PropertyGroup>
<ItemDefinitionGroup>
<ClCompile>
<AdditionalOptions>/USECL:MS_OPTERON /GS- %(AdditionalOptions)</AdditionalOptions>
diff --git a/Tools/buildbot/build-amd64.bat b/Tools/buildbot/build-amd64.bat
index 569c451..7ee7b2d 100644
--- a/Tools/buildbot/build-amd64.bat
+++ b/Tools/buildbot/build-amd64.bat
@@ -1,5 +1,4 @@
@rem Used by the buildbot "compile" step.
-set HOST_PYTHON=%CD%\PCbuild\amd64\python_d.exe
cmd /c Tools\buildbot\external-amd64.bat
call "%VS100COMNTOOLS%\..\..\VC\vcvarsall.bat" x86_amd64
cmd /c Tools\buildbot\clean-amd64.bat