Skip to content

Commit 5fe8ac6

Browse files
zwarezware
authored
[2.7] bpo-27425: Be more explicit in .gitattributes (GH-840) (GH-2086)
Also updates checked-in line endings in several files.
1 parent 9660a7e commit 5fe8ac6

File tree

142 files changed

+42805
-42771
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

142 files changed

+42805
-42771
lines changed

‎.gitattributes

Lines changed: 40 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,42 @@
1+
# Binary data types
2+
*.aif binary
3+
*.aifc binary
4+
*.aiff binary
5+
*.au binary
6+
*.bmp binary
7+
*.db binary
8+
*.exe binary
9+
*.icns binary
10+
*.gif binary
11+
*.ico binary
12+
*.jpg binary
113
*.pck binary
2-
Lib/test/cjkencodings/* binary
3-
Lib/test/decimaltestdata/*.decTest binary
14+
*.png binary
15+
*.tar binary
16+
*.wav binary
17+
*.whl binary
18+
*.zip binary
19+
20+
# Specific binary files
421
Lib/test/sndhdrdata/sndhdr.* binary
5-
Lib/test/test_email/data/msg_26.txt binary
6-
Lib/test/xmltestdata/* binary
7-
Lib/venv/scripts/nt/* binary
8-
Lib/test/coding20731.py binary
22+
23+
# Text files that should not be subject to eol conversion
24+
Lib/test/cjkencodings/* -text
25+
Lib/test/decimaltestdata/*.decTest -text
26+
Lib/email/test/data/*.txt -text
27+
Lib/test/xmltestdata/* -text
28+
29+
# Special files in third party code
30+
Modules/zlib/zlib.map -text
31+
32+
# CRLF files
33+
*.bat text eol=crlf
34+
*.ps1 text eol=crlf
35+
*.sln text eol=crlf
36+
*.vcxproj* text eol=crlf
37+
*.vcproj text eol=crlf
38+
*.vsprops text eol=crlf
39+
*.props text eol=crlf
40+
*.proj text eol=crlf
41+
PCbuild/readme.txt text eol=crlf
42+
PC/readme.txt text eol=crlf

‎Doc/make.bat

Lines changed: 124 additions & 124 deletions
Original file line numberDiff line numberDiff line change
@@ -1,124 +1,124 @@
1-
@echo off
2-
setlocal
3-
4-
pushd %~dp0
5-
6-
set this=%~n0
7-
8-
if "%SPHINXBUILD%" EQU "" set SPHINXBUILD=sphinx-build
9-
if "%PYTHON%" EQU "" set PYTHON=py
10-
11-
if DEFINED ProgramFiles(x86) set _PRGMFLS=%ProgramFiles(x86)%
12-
if NOT DEFINED ProgramFiles(x86) set _PRGMFLS=%ProgramFiles%
13-
if "%HTMLHELP%" EQU "" set HTMLHELP=%_PRGMFLS%\HTML Help Workshop\hhc.exe
14-
15-
if "%DISTVERSION%" EQU "" for /f "usebackq" %%v in (`%PYTHON% tools/extensions/patchlevel.py`) do set DISTVERSION=%%v
16-
17-
if "%BUILDDIR%" EQU "" set BUILDDIR=build
18-
19-
rem Targets that don't require sphinx-build
20-
if "%1" EQU "" goto help
21-
if "%1" EQU "help" goto help
22-
if "%1" EQU "check" goto check
23-
if "%1" EQU "serve" goto serve
24-
if "%1" == "clean" (
25-
rmdir /q /s %BUILDDIR%
26-
goto end
27-
)
28-
29-
%SPHINXBUILD% 2> nul
30-
if errorlevel 9009 (
31-
echo.
32-
echo.The 'sphinx-build' command was not found. Make sure you have Sphinx
33-
echo.installed, then set the SPHINXBUILD environment variable to point
34-
echo.to the full path of the 'sphinx-build' executable. Alternatively you
35-
echo.may add the Sphinx directory to PATH.
36-
echo.
37-
echo.If you don't have Sphinx installed, grab it from
38-
echo.http://sphinx-doc.org/
39-
goto end
40-
)
41-
42-
rem Targets that do require sphinx-build and have their own label
43-
if "%1" EQU "htmlview" goto htmlview
44-
45-
rem Everything else
46-
goto build
47-
48-
:help
49-
echo.usage: %this% BUILDER [filename ...]
50-
echo.
51-
echo.Call %this% with the desired Sphinx builder as the first argument, e.g.
52-
echo.``%this% html`` or ``%this% doctest``. Interesting targets that are
53-
echo.always available include:
54-
echo.
55-
echo. Provided by Sphinx:
56-
echo. html, htmlhelp, latex, text
57-
echo. suspicious, linkcheck, changes, doctest
58-
echo. Provided by this script:
59-
echo. clean, check, serve, htmlview
60-
echo.
61-
echo.All arguments past the first one are passed through to sphinx-build as
62-
echo.filenames to build or are ignored. See README.txt in this directory or
63-
echo.the documentation for your version of Sphinx for more exhaustive lists
64-
echo.of available targets and descriptions of each.
65-
echo.
66-
echo.This script assumes that the SPHINXBUILD environment variable contains
67-
echo.a legitimate command for calling sphinx-build, or that sphinx-build is
68-
echo.on your PATH if SPHINXBUILD is not set. Options for sphinx-build can
69-
echo.be passed by setting the SPHINXOPTS environment variable.
70-
goto end
71-
72-
:build
73-
if NOT "%PAPER%" == "" (
74-
set SPHINXOPTS=-D latex_elements.papersize=%PAPER% %SPHINXOPTS%
75-
)
76-
cmd /C %SPHINXBUILD% %SPHINXOPTS% -b%1 -dbuild\doctrees . %BUILDDIR%\%*
77-
78-
if "%1" EQU "htmlhelp" (
79-
if not exist "%HTMLHELP%" (
80-
echo.
81-
echo.The HTML Help Workshop was not found. Set the HTMLHELP variable
82-
echo.to the path to hhc.exe or download and install it from
83-
echo.http://msdn.microsoft.com/en-us/library/ms669985
84-
rem Set errorlevel to 1 and exit
85-
cmd /C exit /b 1
86-
goto end
87-
)
88-
cmd /C "%HTMLHELP%" build\htmlhelp\python%DISTVERSION:.=%.hhp
89-
rem hhc.exe seems to always exit with code 1, reset to 0 for less than 2
90-
if not errorlevel 2 cmd /C exit /b 0
91-
)
92-
93-
echo.
94-
if errorlevel 1 (
95-
echo.Build failed (exit code %ERRORLEVEL%^), check for error messages
96-
echo.above. Any output will be found in %BUILDDIR%\%1
97-
) else (
98-
echo.Build succeeded. All output should be in %BUILDDIR%\%1
99-
)
100-
goto end
101-
102-
:htmlview
103-
if NOT "%2" EQU "" (
104-
echo.Can't specify filenames to build with htmlview target, ignoring.
105-
)
106-
cmd /C %this% html
107-
108-
if EXIST %BUILDDIR%\html\index.html (
109-
echo.Opening %BUILDDIR%\html\index.html in the default web browser...
110-
start %BUILDDIR%\html\index.html
111-
)
112-
113-
goto end
114-
115-
:check
116-
cmd /C %PYTHON% tools\rstlint.py -i tools
117-
goto end
118-
119-
:serve
120-
cmd /C %PYTHON% ..\Tools\scripts\serve.py %BUILDDIR%\html
121-
goto end
122-
123-
:end
124-
popd
1+
@echo off
2+
setlocal
3+
4+
pushd %~dp0
5+
6+
set this=%~n0
7+
8+
if "%SPHINXBUILD%" EQU "" set SPHINXBUILD=sphinx-build
9+
if "%PYTHON%" EQU "" set PYTHON=py
10+
11+
if DEFINED ProgramFiles(x86) set _PRGMFLS=%ProgramFiles(x86)%
12+
if NOT DEFINED ProgramFiles(x86) set _PRGMFLS=%ProgramFiles%
13+
if "%HTMLHELP%" EQU "" set HTMLHELP=%_PRGMFLS%\HTML Help Workshop\hhc.exe
14+
15+
if "%DISTVERSION%" EQU "" for /f "usebackq" %%v in (`%PYTHON% tools/extensions/patchlevel.py`) do set DISTVERSION=%%v
16+
17+
if "%BUILDDIR%" EQU "" set BUILDDIR=build
18+
19+
rem Targets that don't require sphinx-build
20+
if "%1" EQU "" goto help
21+
if "%1" EQU "help" goto help
22+
if "%1" EQU "check" goto check
23+
if "%1" EQU "serve" goto serve
24+
if "%1" == "clean" (
25+
rmdir /q /s %BUILDDIR%
26+
goto end
27+
)
28+
29+
%SPHINXBUILD% 2> nul
30+
if errorlevel 9009 (
31+
echo.
32+
echo.The 'sphinx-build' command was not found. Make sure you have Sphinx
33+
echo.installed, then set the SPHINXBUILD environment variable to point
34+
echo.to the full path of the 'sphinx-build' executable. Alternatively you
35+
echo.may add the Sphinx directory to PATH.
36+
echo.
37+
echo.If you don't have Sphinx installed, grab it from
38+
echo.http://sphinx-doc.org/
39+
goto end
40+
)
41+
42+
rem Targets that do require sphinx-build and have their own label
43+
if "%1" EQU "htmlview" goto htmlview
44+
45+
rem Everything else
46+
goto build
47+
48+
:help
49+
echo.usage: %this% BUILDER [filename ...]
50+
echo.
51+
echo.Call %this% with the desired Sphinx builder as the first argument, e.g.
52+
echo.``%this% html`` or ``%this% doctest``. Interesting targets that are
53+
echo.always available include:
54+
echo.
55+
echo. Provided by Sphinx:
56+
echo. html, htmlhelp, latex, text
57+
echo. suspicious, linkcheck, changes, doctest
58+
echo. Provided by this script:
59+
echo. clean, check, serve, htmlview
60+
echo.
61+
echo.All arguments past the first one are passed through to sphinx-build as
62+
echo.filenames to build or are ignored. See README.txt in this directory or
63+
echo.the documentation for your version of Sphinx for more exhaustive lists
64+
echo.of available targets and descriptions of each.
65+
echo.
66+
echo.This script assumes that the SPHINXBUILD environment variable contains
67+
echo.a legitimate command for calling sphinx-build, or that sphinx-build is
68+
echo.on your PATH if SPHINXBUILD is not set. Options for sphinx-build can
69+
echo.be passed by setting the SPHINXOPTS environment variable.
70+
goto end
71+
72+
:build
73+
if NOT "%PAPER%" == "" (
74+
set SPHINXOPTS=-D latex_elements.papersize=%PAPER% %SPHINXOPTS%
75+
)
76+
cmd /C %SPHINXBUILD% %SPHINXOPTS% -b%1 -dbuild\doctrees . %BUILDDIR%\%*
77+
78+
if "%1" EQU "htmlhelp" (
79+
if not exist "%HTMLHELP%" (
80+
echo.
81+
echo.The HTML Help Workshop was not found. Set the HTMLHELP variable
82+
echo.to the path to hhc.exe or download and install it from
83+
echo.http://msdn.microsoft.com/en-us/library/ms669985
84+
rem Set errorlevel to 1 and exit
85+
cmd /C exit /b 1
86+
goto end
87+
)
88+
cmd /C "%HTMLHELP%" build\htmlhelp\python%DISTVERSION:.=%.hhp
89+
rem hhc.exe seems to always exit with code 1, reset to 0 for less than 2
90+
if not errorlevel 2 cmd /C exit /b 0
91+
)
92+
93+
echo.
94+
if errorlevel 1 (
95+
echo.Build failed (exit code %ERRORLEVEL%^), check for error messages
96+
echo.above. Any output will be found in %BUILDDIR%\%1
97+
) else (
98+
echo.Build succeeded. All output should be in %BUILDDIR%\%1
99+
)
100+
goto end
101+
102+
:htmlview
103+
if NOT "%2" EQU "" (
104+
echo.Can't specify filenames to build with htmlview target, ignoring.
105+
)
106+
cmd /C %this% html
107+
108+
if EXIST %BUILDDIR%\html\index.html (
109+
echo.Opening %BUILDDIR%\html\index.html in the default web browser...
110+
start %BUILDDIR%\html\index.html
111+
)
112+
113+
goto end
114+
115+
:check
116+
cmd /C %PYTHON% tools\rstlint.py -i tools
117+
goto end
118+
119+
:serve
120+
cmd /C %PYTHON% ..\Tools\scripts\serve.py %BUILDDIR%\html
121+
goto end
122+
123+
:end
124+
popd

‎Lib/ctypes/macholib/fetch_macholib.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
svn export --force http://svn.red-bean.com/bob/macholib/trunk/macholib/ .
1+
svn export --force http://svn.red-bean.com/bob/macholib/trunk/macholib/ .

‎Lib/idlelib/idle.bat

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@echo off
2-
rem Start IDLE using the appropriate Python interpreter
3-
set CURRDIR=%~dp0
4-
start "IDLE" "%CURRDIR%..\..\pythonw.exe" "%CURRDIR%idle.pyw" %1 %2 %3 %4 %5 %6 %7 %8 %9
1+
@echo off
2+
rem Start IDLE using the appropriate Python interpreter
3+
set CURRDIR=%~dp0
4+
start "IDLE" "%CURRDIR%..\..\pythonw.exe" "%CURRDIR%idle.pyw" %1 %2 %3 %4 %5 %6 %7 %8 %9

‎PC/VC6/rt.bat

Lines changed: 41 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,41 @@
1-
@rem Run Tests. Run the regression test suite.
2-
@rem Usage: rt [-d] [-O] [-q] regrtest_args
3-
@rem -d Run Debug build (python_d.exe). Else release build.
4-
@rem -O Run python.exe or python_d.exe (see -d) with -O.
5-
@rem -q "quick" -- normally the tests are run twice, the first time
6-
@rem after deleting all the .py[co] files reachable from Lib/.
7-
@rem -q runs the tests just once, and without deleting .py[co] files.
8-
@rem All leading instances of these switches are shifted off, and
9-
@rem whatever remains is passed to regrtest.py. For example,
10-
@rem rt -O -d -x test_thread
11-
@rem runs
12-
@rem python_d -O ../../lib/test/regrtest.py -x test_thread
13-
@rem twice, and
14-
@rem rt -q -g test_binascii
15-
@rem runs
16-
@rem python_d ../../lib/test/regrtest.py -g test_binascii
17-
@rem to generate the expected-output file for binascii quickly.
18-
@set _exe=python
19-
@set _qmode=no
20-
@set _dashO=
21-
@goto CheckOpts
22-
:Again
23-
@shift
24-
:CheckOpts
25-
@if "%1"=="-O" set _dashO=-O
26-
@if "%1"=="-O" goto Again
27-
@if "%1"=="-q" set _qmode=yes
28-
@if "%1"=="-q" goto Again
29-
@if "%1"=="-d" set _exe=python_d
30-
@if "%1"=="-d" goto Again
31-
@if "%_qmode%"=="yes" goto Qmode
32-
@echo Deleting .pyc/.pyo files ...
33-
@%_exe% rmpyc.py
34-
%_exe% %_dashO% -E -tt ../../lib/test/regrtest.py %1 %2 %3 %4 %5 %6 %7 %8 %9
35-
@echo About to run again without deleting .pyc/.pyo first:
36-
@pause
37-
:Qmode
38-
%_exe% %_dashO% -E -tt ../../lib/test/regrtest.py %1 %2 %3 %4 %5 %6 %7 %8 %9
39-
@set _exe=
40-
@set _qmode=
41-
@set _dashO=
1+
@rem Run Tests. Run the regression test suite.
2+
@rem Usage: rt [-d] [-O] [-q] regrtest_args
3+
@rem -d Run Debug build (python_d.exe). Else release build.
4+
@rem -O Run python.exe or python_d.exe (see -d) with -O.
5+
@rem -q "quick" -- normally the tests are run twice, the first time
6+
@rem after deleting all the .py[co] files reachable from Lib/.
7+
@rem -q runs the tests just once, and without deleting .py[co] files.
8+
@rem All leading instances of these switches are shifted off, and
9+
@rem whatever remains is passed to regrtest.py. For example,
10+
@rem rt -O -d -x test_thread
11+
@rem runs
12+
@rem python_d -O ../../lib/test/regrtest.py -x test_thread
13+
@rem twice, and
14+
@rem rt -q -g test_binascii
15+
@rem runs
16+
@rem python_d ../../lib/test/regrtest.py -g test_binascii
17+
@rem to generate the expected-output file for binascii quickly.
18+
@set _exe=python
19+
@set _qmode=no
20+
@set _dashO=
21+
@goto CheckOpts
22+
:Again
23+
@shift
24+
:CheckOpts
25+
@if "%1"=="-O" set _dashO=-O
26+
@if "%1"=="-O" goto Again
27+
@if "%1"=="-q" set _qmode=yes
28+
@if "%1"=="-q" goto Again
29+
@if "%1"=="-d" set _exe=python_d
30+
@if "%1"=="-d" goto Again
31+
@if "%_qmode%"=="yes" goto Qmode
32+
@echo Deleting .pyc/.pyo files ...
33+
@%_exe% rmpyc.py
34+
%_exe% %_dashO% -E -tt ../../lib/test/regrtest.py %1 %2 %3 %4 %5 %6 %7 %8 %9
35+
@echo About to run again without deleting .pyc/.pyo first:
36+
@pause
37+
:Qmode
38+
%_exe% %_dashO% -E -tt ../../lib/test/regrtest.py %1 %2 %3 %4 %5 %6 %7 %8 %9
39+
@set _exe=
40+
@set _qmode=
41+
@set _dashO=

0 commit comments

Comments
 (0)