From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Thu, 14 Mar 2013 01:33:50 +0000 (-0400)
Subject: Issue #17386 make.bat must run with Python 2 until Sphinx runs with Python 3.
X-Git-Tag: v3.2.4rc1~35
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3b220e11eb8e4768cbdef076d0ac133aaf4a2248;p=thirdparty%2FPython%2Fcpython.git

Issue #17386 make.bat must run with Python 2 until Sphinx runs with Python 3.
If PYTHON is undefined, this fails without the launcher (installed with 3.3 or
from PyPI), but this is better than always failing. Patch from Zachary Ware.
---

diff --git a/Doc/make.bat b/Doc/make.bat
index 4ea2d519b273..af3bade82798 100644
--- a/Doc/make.bat
+++ b/Doc/make.bat
@@ -2,7 +2,7 @@
 setlocal
 
 set SVNROOT=http://svn.python.org/projects
-if "%PYTHON%" EQU "" set PYTHON=..\pcbuild\python
+if "%PYTHON%" EQU "" set PYTHON=py -2
 if "%HTMLHELP%" EQU "" set HTMLHELP=%ProgramFiles%\HTML Help Workshop\hhc.exe
 if "%DISTVERSION%" EQU "" for /f "usebackq" %%v in (`%PYTHON% tools/sphinxext/patchlevel.py`) do set DISTVERSION=%%v