Fix line endings on DOS files that want CRLF preserved.

2 files changed, 98 insertions, 98 deletions

diff --git a/src/os_spawnv_fix.diff b/src/os_spawnv_fix.diff
index b838346..926f896 100644
--- a/src/os_spawnv_fix.diff
+++ b/src/os_spawnv_fix.diff
@@ -1,83 +1,83 @@
-? dist/src/Mac/IDE scripts/Hold option to open a script
-? dist/src/Mac/IDE scripts/Insert file name
-? dist/src/Mac/IDE scripts/Insert folder name
-? dist/src/Mac/IDE scripts/Search Python Documentation
-? dist/src/Mac/IDE scripts/Hack/Remove .pyc files
-? dist/src/Mac/IDE scripts/Hack/Toolbox Assistant
-Index: dist/src/Modules/posixmodule.c
-===================================================================
-RCS file: /cvsroot/python/python/dist/src/Modules/posixmodule.c,v
-retrieving revision 2.213
-diff -c -c -r2.213 posixmodule.c
-*** dist/src/Modules/posixmodule.c	2001/12/03 20:41:00	2.213
---- dist/src/Modules/posixmodule.c	2001/12/05 00:52:58
-***************
-*** 1668,1674 ****
-  #ifdef HAVE_SPAWNV
-  static char posix_spawnv__doc__[] =
-  "spawnv(mode, path, args)\n\
-! Execute an executable path with arguments, replacing current process.\n\
-  \n\
-  	mode: mode of process creation\n\
-  	path: path of executable file\n\
---- 1668,1674 ----
-  #ifdef HAVE_SPAWNV
-  static char posix_spawnv__doc__[] =
-  "spawnv(mode, path, args)\n\
-! Execute the program 'path' in a new process.\n\
-  \n\
-  	mode: mode of process creation\n\
-  	path: path of executable file\n\
-***************
-*** 1717,1724 ****
-  
-  	if (mode == _OLD_P_OVERLAY)
-  		mode = _P_OVERLAY;
-  	spawnval = _spawnv(mode, path, argvlist);
-! 
-  	PyMem_DEL(argvlist);
-  
-  	if (spawnval == -1)
---- 1717,1727 ----
-  
-  	if (mode == _OLD_P_OVERLAY)
-  		mode = _P_OVERLAY;
-+ 	
-+ 	Py_BEGIN_ALLOW_THREADS
-  	spawnval = _spawnv(mode, path, argvlist);
-! 	Py_END_ALLOW_THREADS
-! 	
-  	PyMem_DEL(argvlist);
-  
-  	if (spawnval == -1)
-***************
-*** 1734,1740 ****
-  
-  static char posix_spawnve__doc__[] =
-  "spawnve(mode, path, args, env)\n\
-! Execute a path with arguments and environment, replacing current process.\n\
-  \n\
-  	mode: mode of process creation\n\
-  	path: path of executable file\n\
---- 1737,1743 ----
-  
-  static char posix_spawnve__doc__[] =
-  "spawnve(mode, path, args, env)\n\
-! Execute the program 'path' in a new process.\n\
-  \n\
-  	mode: mode of process creation\n\
-  	path: path of executable file\n\
-***************
-*** 1830,1836 ****
---- 1833,1843 ----
-  
-  	if (mode == _OLD_P_OVERLAY)
-  		mode = _P_OVERLAY;
-+ 
-+ 	Py_BEGIN_ALLOW_THREADS
-  	spawnval = _spawnve(mode, path, argvlist, envlist);
-+ 	Py_END_ALLOW_THREADS
-+ 
-  	if (spawnval == -1)
-  		(void) posix_error();
-  	else
+? dist/src/Mac/IDE scripts/Hold option to open a script

+? dist/src/Mac/IDE scripts/Insert file name

+? dist/src/Mac/IDE scripts/Insert folder name

+? dist/src/Mac/IDE scripts/Search Python Documentation

+? dist/src/Mac/IDE scripts/Hack/Remove .pyc files

+? dist/src/Mac/IDE scripts/Hack/Toolbox Assistant

+Index: dist/src/Modules/posixmodule.c

+===================================================================

+RCS file: /cvsroot/python/python/dist/src/Modules/posixmodule.c,v

+retrieving revision 2.213

+diff -c -c -r2.213 posixmodule.c

+*** dist/src/Modules/posixmodule.c	2001/12/03 20:41:00	2.213

+--- dist/src/Modules/posixmodule.c	2001/12/05 00:52:58

+***************

+*** 1668,1674 ****

+  #ifdef HAVE_SPAWNV

+  static char posix_spawnv__doc__[] =

+  "spawnv(mode, path, args)\n\

+! Execute an executable path with arguments, replacing current process.\n\

+  \n\

+  	mode: mode of process creation\n\

+  	path: path of executable file\n\

+--- 1668,1674 ----

+  #ifdef HAVE_SPAWNV

+  static char posix_spawnv__doc__[] =

+  "spawnv(mode, path, args)\n\

+! Execute the program 'path' in a new process.\n\

+  \n\

+  	mode: mode of process creation\n\

+  	path: path of executable file\n\

+***************

+*** 1717,1724 ****

+  

+  	if (mode == _OLD_P_OVERLAY)

+  		mode = _P_OVERLAY;

+  	spawnval = _spawnv(mode, path, argvlist);

+! 

+  	PyMem_DEL(argvlist);

+  

+  	if (spawnval == -1)

+--- 1717,1727 ----

+  

+  	if (mode == _OLD_P_OVERLAY)

+  		mode = _P_OVERLAY;

++ 	

++ 	Py_BEGIN_ALLOW_THREADS

+  	spawnval = _spawnv(mode, path, argvlist);

+! 	Py_END_ALLOW_THREADS

+! 	

+  	PyMem_DEL(argvlist);

+  

+  	if (spawnval == -1)

+***************

+*** 1734,1740 ****

+  

+  static char posix_spawnve__doc__[] =

+  "spawnve(mode, path, args, env)\n\

+! Execute a path with arguments and environment, replacing current process.\n\

+  \n\

+  	mode: mode of process creation\n\

+  	path: path of executable file\n\

+--- 1737,1743 ----

+  

+  static char posix_spawnve__doc__[] =

+  "spawnve(mode, path, args, env)\n\

+! Execute the program 'path' in a new process.\n\

+  \n\

+  	mode: mode of process creation\n\

+  	path: path of executable file\n\

+***************

+*** 1830,1836 ****

+--- 1833,1843 ----

+  

+  	if (mode == _OLD_P_OVERLAY)

+  		mode = _P_OVERLAY;

++ 

++ 	Py_BEGIN_ALLOW_THREADS

+  	spawnval = _spawnve(mode, path, argvlist, envlist);

++ 	Py_END_ALLOW_THREADS

++ 

+  	if (spawnval == -1)

+  		(void) posix_error();

+  	else

diff --git a/src/script/scons.bat b/src/script/scons.bat
index 015cfc6..9e45a91 100644
--- a/src/script/scons.bat
+++ b/src/script/scons.bat
@@ -1,15 +1,15 @@
-@REM __COPYRIGHT__
-@REM __FILE__ __REVISION__ __DATE__ __DEVELOPER__
-@echo off
-if "%OS%" == "Windows_NT" goto WinNT
-REM for 9x/Me you better not have more than 9 args
-python -c "from os.path import join; import sys; sys.path = [ join(sys.prefix, 'Lib', 'site-packages', 'scons-__VERSION__'), join(sys.prefix, 'Lib', 'site-packages', 'scons'), join(sys.prefix, 'scons-__VERSION__'), join(sys.prefix, 'scons')] + sys.path; import SCons.Script; SCons.Script.main()" %1 %2 %3 %4 %5 %6 %7 %8 %9
-@REM no way to set exit status of this script for 9x/Me
-goto endscons
-:WinNT
-python -c "from os.path import join; import sys; sys.path = [ join(sys.prefix, 'Lib', 'site-packages', 'scons-__VERSION__'), join(sys.prefix, 'Lib', 'site-packages', 'scons'), join(sys.prefix, 'scons-__VERSION__'), join(sys.prefix, 'scons')] + sys.path; import SCons.Script; SCons.Script.main()" %*
-if NOT "%COMSPEC%" == "%SystemRoot%\system32\cmd.exe" goto endscons
-if errorlevel 9009 echo you do not have python in your PATH
-@REM color 00 causes this script to exit with non-zero exit status
-if errorlevel 1 color 00
-:endscons
+@REM __COPYRIGHT__

+@REM __FILE__ __REVISION__ __DATE__ __DEVELOPER__

+@echo off

+if "%OS%" == "Windows_NT" goto WinNT

+REM for 9x/Me you better not have more than 9 args

+python -c "from os.path import join; import sys; sys.path = [ join(sys.prefix, 'Lib', 'site-packages', 'scons-__VERSION__'), join(sys.prefix, 'Lib', 'site-packages', 'scons'), join(sys.prefix, 'scons-__VERSION__'), join(sys.prefix, 'scons')] + sys.path; import SCons.Script; SCons.Script.main()" %1 %2 %3 %4 %5 %6 %7 %8 %9

+@REM no way to set exit status of this script for 9x/Me

+goto endscons

+:WinNT

+python -c "from os.path import join; import sys; sys.path = [ join(sys.prefix, 'Lib', 'site-packages', 'scons-__VERSION__'), join(sys.prefix, 'Lib', 'site-packages', 'scons'), join(sys.prefix, 'scons-__VERSION__'), join(sys.prefix, 'scons')] + sys.path; import SCons.Script; SCons.Script.main()" %*

+if NOT "%COMSPEC%" == "%SystemRoot%\system32\cmd.exe" goto endscons

+if errorlevel 9009 echo you do not have python in your PATH

+@REM color 00 causes this script to exit with non-zero exit status

+if errorlevel 1 color 00

+:endscons