forked from python/cpython
-
Notifications
You must be signed in to change notification settings - Fork 4
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[2.7] bpo-27425: Be more explicit in .gitattributes (pythonGH-840) (p…
…ythonGH-2086) Also updates checked-in line endings in several files.
- Loading branch information
Showing
142 changed files
with
42,805 additions
and
42,771 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,8 +1,42 @@ | ||
| # Binary data types | ||
| *.aif binary | ||
| *.aifc binary | ||
| *.aiff binary | ||
| *.au binary | ||
| *.bmp binary | ||
| *.db binary | ||
| *.exe binary | ||
| *.icns binary | ||
| *.gif binary | ||
| *.ico binary | ||
| *.jpg binary | ||
| *.pck binary | ||
| Lib/test/cjkencodings/* binary | ||
| Lib/test/decimaltestdata/*.decTest binary | ||
| *.png binary | ||
| *.tar binary | ||
| *.wav binary | ||
| *.whl binary | ||
| *.zip binary | ||
|
|
||
| # Specific binary files | ||
| Lib/test/sndhdrdata/sndhdr.* binary | ||
| Lib/test/test_email/data/msg_26.txt binary | ||
| Lib/test/xmltestdata/* binary | ||
| Lib/venv/scripts/nt/* binary | ||
| Lib/test/coding20731.py binary | ||
|
|
||
| # Text files that should not be subject to eol conversion | ||
| Lib/test/cjkencodings/* -text | ||
| Lib/test/decimaltestdata/*.decTest -text | ||
| Lib/email/test/data/*.txt -text | ||
| Lib/test/xmltestdata/* -text | ||
|
|
||
| # Special files in third party code | ||
| Modules/zlib/zlib.map -text | ||
|
|
||
| # CRLF files | ||
| *.bat text eol=crlf | ||
| *.ps1 text eol=crlf | ||
| *.sln text eol=crlf | ||
| *.vcxproj* text eol=crlf | ||
| *.vcproj text eol=crlf | ||
| *.vsprops text eol=crlf | ||
| *.props text eol=crlf | ||
| *.proj text eol=crlf | ||
| PCbuild/readme.txt text eol=crlf | ||
| PC/readme.txt text eol=crlf |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,124 +1,124 @@ | ||
| @echo off | ||
| setlocal | ||
|
|
||
| pushd %~dp0 | ||
|
|
||
| set this=%~n0 | ||
|
|
||
| if "%SPHINXBUILD%" EQU "" set SPHINXBUILD=sphinx-build | ||
| if "%PYTHON%" EQU "" set PYTHON=py | ||
|
|
||
| if DEFINED ProgramFiles(x86) set _PRGMFLS=%ProgramFiles(x86)% | ||
| if NOT DEFINED ProgramFiles(x86) set _PRGMFLS=%ProgramFiles% | ||
| if "%HTMLHELP%" EQU "" set HTMLHELP=%_PRGMFLS%\HTML Help Workshop\hhc.exe | ||
|
|
||
| if "%DISTVERSION%" EQU "" for /f "usebackq" %%v in (`%PYTHON% tools/extensions/patchlevel.py`) do set DISTVERSION=%%v | ||
|
|
||
| if "%BUILDDIR%" EQU "" set BUILDDIR=build | ||
|
|
||
| rem Targets that don't require sphinx-build | ||
| if "%1" EQU "" goto help | ||
| if "%1" EQU "help" goto help | ||
| if "%1" EQU "check" goto check | ||
| if "%1" EQU "serve" goto serve | ||
| if "%1" == "clean" ( | ||
| rmdir /q /s %BUILDDIR% | ||
| goto end | ||
| ) | ||
|
|
||
| %SPHINXBUILD% 2> nul | ||
| if errorlevel 9009 ( | ||
| echo. | ||
| echo.The 'sphinx-build' command was not found. Make sure you have Sphinx | ||
| echo.installed, then set the SPHINXBUILD environment variable to point | ||
| echo.to the full path of the 'sphinx-build' executable. Alternatively you | ||
| echo.may add the Sphinx directory to PATH. | ||
| echo. | ||
| echo.If you don't have Sphinx installed, grab it from | ||
| echo.http://sphinx-doc.org/ | ||
| goto end | ||
| ) | ||
|
|
||
| rem Targets that do require sphinx-build and have their own label | ||
| if "%1" EQU "htmlview" goto htmlview | ||
|
|
||
| rem Everything else | ||
| goto build | ||
|
|
||
| :help | ||
| echo.usage: %this% BUILDER [filename ...] | ||
| echo. | ||
| echo.Call %this% with the desired Sphinx builder as the first argument, e.g. | ||
| echo.``%this% html`` or ``%this% doctest``. Interesting targets that are | ||
| echo.always available include: | ||
| echo. | ||
| echo. Provided by Sphinx: | ||
| echo. html, htmlhelp, latex, text | ||
| echo. suspicious, linkcheck, changes, doctest | ||
| echo. Provided by this script: | ||
| echo. clean, check, serve, htmlview | ||
| echo. | ||
| echo.All arguments past the first one are passed through to sphinx-build as | ||
| echo.filenames to build or are ignored. See README.txt in this directory or | ||
| echo.the documentation for your version of Sphinx for more exhaustive lists | ||
| echo.of available targets and descriptions of each. | ||
| echo. | ||
| echo.This script assumes that the SPHINXBUILD environment variable contains | ||
| echo.a legitimate command for calling sphinx-build, or that sphinx-build is | ||
| echo.on your PATH if SPHINXBUILD is not set. Options for sphinx-build can | ||
| echo.be passed by setting the SPHINXOPTS environment variable. | ||
| goto end | ||
|
|
||
| :build | ||
| if NOT "%PAPER%" == "" ( | ||
| set SPHINXOPTS=-D latex_elements.papersize=%PAPER% %SPHINXOPTS% | ||
| ) | ||
| cmd /C %SPHINXBUILD% %SPHINXOPTS% -b%1 -dbuild\doctrees . %BUILDDIR%\%* | ||
|
|
||
| if "%1" EQU "htmlhelp" ( | ||
| if not exist "%HTMLHELP%" ( | ||
| echo. | ||
| echo.The HTML Help Workshop was not found. Set the HTMLHELP variable | ||
| echo.to the path to hhc.exe or download and install it from | ||
| echo.http://msdn.microsoft.com/en-us/library/ms669985 | ||
| rem Set errorlevel to 1 and exit | ||
| cmd /C exit /b 1 | ||
| goto end | ||
| ) | ||
| cmd /C "%HTMLHELP%" build\htmlhelp\python%DISTVERSION:.=%.hhp | ||
| rem hhc.exe seems to always exit with code 1, reset to 0 for less than 2 | ||
| if not errorlevel 2 cmd /C exit /b 0 | ||
| ) | ||
|
|
||
| echo. | ||
| if errorlevel 1 ( | ||
| echo.Build failed (exit code %ERRORLEVEL%^), check for error messages | ||
| echo.above. Any output will be found in %BUILDDIR%\%1 | ||
| ) else ( | ||
| echo.Build succeeded. All output should be in %BUILDDIR%\%1 | ||
| ) | ||
| goto end | ||
|
|
||
| :htmlview | ||
| if NOT "%2" EQU "" ( | ||
| echo.Can't specify filenames to build with htmlview target, ignoring. | ||
| ) | ||
| cmd /C %this% html | ||
|
|
||
| if EXIST %BUILDDIR%\html\index.html ( | ||
| echo.Opening %BUILDDIR%\html\index.html in the default web browser... | ||
| start %BUILDDIR%\html\index.html | ||
| ) | ||
|
|
||
| goto end | ||
|
|
||
| :check | ||
| cmd /C %PYTHON% tools\rstlint.py -i tools | ||
| goto end | ||
|
|
||
| :serve | ||
| cmd /C %PYTHON% ..\Tools\scripts\serve.py %BUILDDIR%\html | ||
| goto end | ||
|
|
||
| :end | ||
| popd | ||
| @echo off | ||
| setlocal | ||
|
|
||
| pushd %~dp0 | ||
|
|
||
| set this=%~n0 | ||
|
|
||
| if "%SPHINXBUILD%" EQU "" set SPHINXBUILD=sphinx-build | ||
| if "%PYTHON%" EQU "" set PYTHON=py | ||
|
|
||
| if DEFINED ProgramFiles(x86) set _PRGMFLS=%ProgramFiles(x86)% | ||
| if NOT DEFINED ProgramFiles(x86) set _PRGMFLS=%ProgramFiles% | ||
| if "%HTMLHELP%" EQU "" set HTMLHELP=%_PRGMFLS%\HTML Help Workshop\hhc.exe | ||
|
|
||
| if "%DISTVERSION%" EQU "" for /f "usebackq" %%v in (`%PYTHON% tools/extensions/patchlevel.py`) do set DISTVERSION=%%v | ||
|
|
||
| if "%BUILDDIR%" EQU "" set BUILDDIR=build | ||
|
|
||
| rem Targets that don't require sphinx-build | ||
| if "%1" EQU "" goto help | ||
| if "%1" EQU "help" goto help | ||
| if "%1" EQU "check" goto check | ||
| if "%1" EQU "serve" goto serve | ||
| if "%1" == "clean" ( | ||
| rmdir /q /s %BUILDDIR% | ||
| goto end | ||
| ) | ||
|
|
||
| %SPHINXBUILD% 2> nul | ||
| if errorlevel 9009 ( | ||
| echo. | ||
| echo.The 'sphinx-build' command was not found. Make sure you have Sphinx | ||
| echo.installed, then set the SPHINXBUILD environment variable to point | ||
| echo.to the full path of the 'sphinx-build' executable. Alternatively you | ||
| echo.may add the Sphinx directory to PATH. | ||
| echo. | ||
| echo.If you don't have Sphinx installed, grab it from | ||
| echo.http://sphinx-doc.org/ | ||
| goto end | ||
| ) | ||
|
|
||
| rem Targets that do require sphinx-build and have their own label | ||
| if "%1" EQU "htmlview" goto htmlview | ||
|
|
||
| rem Everything else | ||
| goto build | ||
|
|
||
| :help | ||
| echo.usage: %this% BUILDER [filename ...] | ||
| echo. | ||
| echo.Call %this% with the desired Sphinx builder as the first argument, e.g. | ||
| echo.``%this% html`` or ``%this% doctest``. Interesting targets that are | ||
| echo.always available include: | ||
| echo. | ||
| echo. Provided by Sphinx: | ||
| echo. html, htmlhelp, latex, text | ||
| echo. suspicious, linkcheck, changes, doctest | ||
| echo. Provided by this script: | ||
| echo. clean, check, serve, htmlview | ||
| echo. | ||
| echo.All arguments past the first one are passed through to sphinx-build as | ||
| echo.filenames to build or are ignored. See README.txt in this directory or | ||
| echo.the documentation for your version of Sphinx for more exhaustive lists | ||
| echo.of available targets and descriptions of each. | ||
| echo. | ||
| echo.This script assumes that the SPHINXBUILD environment variable contains | ||
| echo.a legitimate command for calling sphinx-build, or that sphinx-build is | ||
| echo.on your PATH if SPHINXBUILD is not set. Options for sphinx-build can | ||
| echo.be passed by setting the SPHINXOPTS environment variable. | ||
| goto end | ||
|
|
||
| :build | ||
| if NOT "%PAPER%" == "" ( | ||
| set SPHINXOPTS=-D latex_elements.papersize=%PAPER% %SPHINXOPTS% | ||
| ) | ||
| cmd /C %SPHINXBUILD% %SPHINXOPTS% -b%1 -dbuild\doctrees . %BUILDDIR%\%* | ||
|
|
||
| if "%1" EQU "htmlhelp" ( | ||
| if not exist "%HTMLHELP%" ( | ||
| echo. | ||
| echo.The HTML Help Workshop was not found. Set the HTMLHELP variable | ||
| echo.to the path to hhc.exe or download and install it from | ||
| echo.http://msdn.microsoft.com/en-us/library/ms669985 | ||
| rem Set errorlevel to 1 and exit | ||
| cmd /C exit /b 1 | ||
| goto end | ||
| ) | ||
| cmd /C "%HTMLHELP%" build\htmlhelp\python%DISTVERSION:.=%.hhp | ||
| rem hhc.exe seems to always exit with code 1, reset to 0 for less than 2 | ||
| if not errorlevel 2 cmd /C exit /b 0 | ||
| ) | ||
|
|
||
| echo. | ||
| if errorlevel 1 ( | ||
| echo.Build failed (exit code %ERRORLEVEL%^), check for error messages | ||
| echo.above. Any output will be found in %BUILDDIR%\%1 | ||
| ) else ( | ||
| echo.Build succeeded. All output should be in %BUILDDIR%\%1 | ||
| ) | ||
| goto end | ||
|
|
||
| :htmlview | ||
| if NOT "%2" EQU "" ( | ||
| echo.Can't specify filenames to build with htmlview target, ignoring. | ||
| ) | ||
| cmd /C %this% html | ||
|
|
||
| if EXIST %BUILDDIR%\html\index.html ( | ||
| echo.Opening %BUILDDIR%\html\index.html in the default web browser... | ||
| start %BUILDDIR%\html\index.html | ||
| ) | ||
|
|
||
| goto end | ||
|
|
||
| :check | ||
| cmd /C %PYTHON% tools\rstlint.py -i tools | ||
| goto end | ||
|
|
||
| :serve | ||
| cmd /C %PYTHON% ..\Tools\scripts\serve.py %BUILDDIR%\html | ||
| goto end | ||
|
|
||
| :end | ||
| popd |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| svn export --force http://svn.red-bean.com/bob/macholib/trunk/macholib/ . | ||
| svn export --force http://svn.red-bean.com/bob/macholib/trunk/macholib/ . |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| @echo off | ||
| rem Start IDLE using the appropriate Python interpreter | ||
| set CURRDIR=%~dp0 | ||
| start "IDLE" "%CURRDIR%..\..\pythonw.exe" "%CURRDIR%idle.pyw" %1 %2 %3 %4 %5 %6 %7 %8 %9 | ||
| @echo off | ||
| rem Start IDLE using the appropriate Python interpreter | ||
| set CURRDIR=%~dp0 | ||
| start "IDLE" "%CURRDIR%..\..\pythonw.exe" "%CURRDIR%idle.pyw" %1 %2 %3 %4 %5 %6 %7 %8 %9 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,41 +1,41 @@ | ||
| @rem Run Tests. Run the regression test suite. | ||
| @rem Usage: rt [-d] [-O] [-q] regrtest_args | ||
| @rem -d Run Debug build (python_d.exe). Else release build. | ||
| @rem -O Run python.exe or python_d.exe (see -d) with -O. | ||
| @rem -q "quick" -- normally the tests are run twice, the first time | ||
| @rem after deleting all the .py[co] files reachable from Lib/. | ||
| @rem -q runs the tests just once, and without deleting .py[co] files. | ||
| @rem All leading instances of these switches are shifted off, and | ||
| @rem whatever remains is passed to regrtest.py. For example, | ||
| @rem rt -O -d -x test_thread | ||
| @rem runs | ||
| @rem python_d -O ../../lib/test/regrtest.py -x test_thread | ||
| @rem twice, and | ||
| @rem rt -q -g test_binascii | ||
| @rem runs | ||
| @rem python_d ../../lib/test/regrtest.py -g test_binascii | ||
| @rem to generate the expected-output file for binascii quickly. | ||
| @set _exe=python | ||
| @set _qmode=no | ||
| @set _dashO= | ||
| @goto CheckOpts | ||
| :Again | ||
| @shift | ||
| :CheckOpts | ||
| @if "%1"=="-O" set _dashO=-O | ||
| @if "%1"=="-O" goto Again | ||
| @if "%1"=="-q" set _qmode=yes | ||
| @if "%1"=="-q" goto Again | ||
| @if "%1"=="-d" set _exe=python_d | ||
| @if "%1"=="-d" goto Again | ||
| @if "%_qmode%"=="yes" goto Qmode | ||
| @echo Deleting .pyc/.pyo files ... | ||
| @%_exe% rmpyc.py | ||
| %_exe% %_dashO% -E -tt ../../lib/test/regrtest.py %1 %2 %3 %4 %5 %6 %7 %8 %9 | ||
| @echo About to run again without deleting .pyc/.pyo first: | ||
| @pause | ||
| :Qmode | ||
| %_exe% %_dashO% -E -tt ../../lib/test/regrtest.py %1 %2 %3 %4 %5 %6 %7 %8 %9 | ||
| @set _exe= | ||
| @set _qmode= | ||
| @set _dashO= | ||
| @rem Run Tests. Run the regression test suite. | ||
| @rem Usage: rt [-d] [-O] [-q] regrtest_args | ||
| @rem -d Run Debug build (python_d.exe). Else release build. | ||
| @rem -O Run python.exe or python_d.exe (see -d) with -O. | ||
| @rem -q "quick" -- normally the tests are run twice, the first time | ||
| @rem after deleting all the .py[co] files reachable from Lib/. | ||
| @rem -q runs the tests just once, and without deleting .py[co] files. | ||
| @rem All leading instances of these switches are shifted off, and | ||
| @rem whatever remains is passed to regrtest.py. For example, | ||
| @rem rt -O -d -x test_thread | ||
| @rem runs | ||
| @rem python_d -O ../../lib/test/regrtest.py -x test_thread | ||
| @rem twice, and | ||
| @rem rt -q -g test_binascii | ||
| @rem runs | ||
| @rem python_d ../../lib/test/regrtest.py -g test_binascii | ||
| @rem to generate the expected-output file for binascii quickly. | ||
| @set _exe=python | ||
| @set _qmode=no | ||
| @set _dashO= | ||
| @goto CheckOpts | ||
| :Again | ||
| @shift | ||
| :CheckOpts | ||
| @if "%1"=="-O" set _dashO=-O | ||
| @if "%1"=="-O" goto Again | ||
| @if "%1"=="-q" set _qmode=yes | ||
| @if "%1"=="-q" goto Again | ||
| @if "%1"=="-d" set _exe=python_d | ||
| @if "%1"=="-d" goto Again | ||
| @if "%_qmode%"=="yes" goto Qmode | ||
| @echo Deleting .pyc/.pyo files ... | ||
| @%_exe% rmpyc.py | ||
| %_exe% %_dashO% -E -tt ../../lib/test/regrtest.py %1 %2 %3 %4 %5 %6 %7 %8 %9 | ||
| @echo About to run again without deleting .pyc/.pyo first: | ||
| @pause | ||
| :Qmode | ||
| %_exe% %_dashO% -E -tt ../../lib/test/regrtest.py %1 %2 %3 %4 %5 %6 %7 %8 %9 | ||
| @set _exe= | ||
| @set _qmode= | ||
| @set _dashO= |
Oops, something went wrong.