Skip to content

Normalize line endings of text files in the repository (#304) #531

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
slozier merged 5 commits into from
Feb 4, 2019
Merged

Normalize line endings of text files in the repository (#304) #531

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
26909d5
Correct line endings rule for .ps1 files (#304)
BCSharp Feb 3, 2019
f492b6f
Fix line endings in .py files (#304)
BCSharp Feb 4, 2019
15f0805
Fix line endings in .log files (#304)
BCSharp Feb 4, 2019
d51f872
Take over gitattributes from cpython (#304)
BCSharp Feb 4, 2019
d8d30a5
Revert "Fix line endings in .py files (#304)"
BCSharp Feb 4, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitattributes
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
*.py text
*.rb text
*.html text
*.ps1 text

# Declare files that will always have CRLF line endings on checkout.
*.bat text eol=crlf
Expand All @@ -26,7 +27,6 @@
# Declare files that will always have LF line endings on checkout
.gitmodules text eol=lf
*.sh text eol=lf
make.ps1 text eol=lf


# Denote all files that are truly binary and should not be modified.
Expand Down
37 changes: 37 additions & 0 deletions Src/StdLib/.gitattributes
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
# Binary data types
*.aif binary
*.aifc binary
*.aiff binary
*.au binary
*.bmp binary
*.exe binary
*.icns binary
*.gif binary
*.ico binary
*.jpg binary
*.pck binary
*.png binary
*.psd binary
*.tar binary
*.wav binary
*.whl binary
*.zip binary

# Specific binary files
Lib/test/sndhdrdata/sndhdr.* binary

# Text files that should not be subject to eol conversion
Lib/test/cjkencodings/* -text
Lib/test/decimaltestdata/*.decTest -text
Lib/test/test_email/data/*.txt -text
Lib/test/xmltestdata/* -text
Lib/test/coding20731.py -text
Lib/test/test_importlib/data01/* -text

# CRLF files
*.bat text eol=crlf
*.ps1 text eol=crlf
*.sln text eol=crlf
*.vcxproj* text eol=crlf
*.props text eol=crlf
*.proj text eol=crlf
112 changes: 56 additions & 56 deletions Tests/Tools/baselines/__builtin__.log
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,56 +1,56 @@
Implement rest of __builtin__ module
IP VERSION AFFECTED: 2.7
FLAGS PASSED TO IPY.EXE: None
OPERATING SYSTEMS AFFECTED: All
DESCRIPTION
-------------------------------------------------------
Complete list of module attributes that should be removed
from IronPython:
__builtin__ memoryview
__builtin__.buffer __radd__ # codeplex bug #23354 http://ironpython.codeplex.com/WorkItem/View.aspx?WorkItemId=23354
__builtin__.bytearray __radd__ # codeplex bug #23354 http://ironpython.codeplex.com/WorkItem/View.aspx?WorkItemId=23354
__builtin__.classmethod __func__
__builtin__.min __class__
__builtin__.min __delattr__
__builtin__.min __delitem__
__builtin__.min __doc__
__builtin__.min __eq__
__builtin__.min __format__
__builtin__.min __ge__
__builtin__.min __getattribute__
__builtin__.min __getitem__
__builtin__.min __gt__
__builtin__.min __hash__
__builtin__.min __init__
__builtin__.min __le__
__builtin__.min __len__
__builtin__.min __lt__
__builtin__.min __ne__
__builtin__.min __new__
__builtin__.min __reduce__
__builtin__.min __reduce_ex__
__builtin__.min __repr__
__builtin__.min __setattr__
__builtin__.min __setitem__
__builtin__.min __sizeof__
__builtin__.min __str__
__builtin__.min __subclasshook__
__builtin__.min format
__builtin__.min itemsize
__builtin__.min ndim
__builtin__.min readonly
__builtin__.min shape
__builtin__.min strides
__builtin__.min suboffsets
__builtin__.min tobytes
__builtin__.min tolist
__builtin__.slice __eq__
__builtin__.slice __ge__
__builtin__.slice __gt__
__builtin__.slice __le__
__builtin__.slice __lt__
__builtin__.slice __ne__
__builtin__.staticmethod __func__
Implement rest of __builtin__ module


IP VERSION AFFECTED: 2.7
FLAGS PASSED TO IPY.EXE: None
OPERATING SYSTEMS AFFECTED: All

DESCRIPTION
-------------------------------------------------------
Complete list of module attributes that should be removed
from IronPython:
__builtin__ memoryview
__builtin__.buffer __radd__ # codeplex bug #23354 http://ironpython.codeplex.com/WorkItem/View.aspx?WorkItemId=23354
__builtin__.bytearray __radd__ # codeplex bug #23354 http://ironpython.codeplex.com/WorkItem/View.aspx?WorkItemId=23354
__builtin__.classmethod __func__
__builtin__.min __class__
__builtin__.min __delattr__
__builtin__.min __delitem__
__builtin__.min __doc__
__builtin__.min __eq__
__builtin__.min __format__
__builtin__.min __ge__
__builtin__.min __getattribute__
__builtin__.min __getitem__
__builtin__.min __gt__
__builtin__.min __hash__
__builtin__.min __init__
__builtin__.min __le__
__builtin__.min __len__
__builtin__.min __lt__
__builtin__.min __ne__
__builtin__.min __new__
__builtin__.min __reduce__
__builtin__.min __reduce_ex__
__builtin__.min __repr__
__builtin__.min __setattr__
__builtin__.min __setitem__
__builtin__.min __sizeof__
__builtin__.min __str__
__builtin__.min __subclasshook__
__builtin__.min format
__builtin__.min itemsize
__builtin__.min ndim
__builtin__.min readonly
__builtin__.min shape
__builtin__.min strides
__builtin__.min suboffsets
__builtin__.min tobytes
__builtin__.min tolist
__builtin__.slice __eq__
__builtin__.slice __ge__
__builtin__.slice __gt__
__builtin__.slice __le__
__builtin__.slice __lt__
__builtin__.slice __ne__
__builtin__.staticmethod __func__
32 changes: 16 additions & 16 deletions Tests/Tools/baselines/_codecs.log
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
Implement rest of _codecs module
IP VERSION AFFECTED: 2.7
FLAGS PASSED TO IPY.EXE: None
OPERATING SYSTEMS AFFECTED: All
DESCRIPTION
-------------------------------------------------------
Complete list of module attributes IronPython is still
missing implementations for:
_codecs utf_32_be_decode # http://ironpython.codeplex.com/WorkItem/View.aspx?WorkItemId=17454
_codecs utf_32_be_encode # http://ironpython.codeplex.com/WorkItem/View.aspx?WorkItemId=17454
Implement rest of _codecs module


IP VERSION AFFECTED: 2.7
FLAGS PASSED TO IPY.EXE: None
OPERATING SYSTEMS AFFECTED: All

DESCRIPTION
-------------------------------------------------------
Complete list of module attributes IronPython is still
missing implementations for:
_codecs utf_32_be_decode # http://ironpython.codeplex.com/WorkItem/View.aspx?WorkItemId=17454
_codecs utf_32_be_encode # http://ironpython.codeplex.com/WorkItem/View.aspx?WorkItemId=17454



28 changes: 14 additions & 14 deletions Tests/Tools/baselines/_collections.log
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
Implement rest of _collections module
IP VERSION AFFECTED: 2.7
FLAGS PASSED TO IPY.EXE: None
OPERATING SYSTEMS AFFECTED: All
DESCRIPTION
-------------------------------------------------------
Complete list of module attributes that should be removed
from IronPython:
_collections.defaultdict viewitems
_collections.defaultdict viewkeys
_collections.defaultdict viewvalues
Implement rest of _collections module


IP VERSION AFFECTED: 2.7
FLAGS PASSED TO IPY.EXE: None
OPERATING SYSTEMS AFFECTED: All

DESCRIPTION
-------------------------------------------------------
Complete list of module attributes that should be removed
from IronPython:
_collections.defaultdict viewitems
_collections.defaultdict viewkeys
_collections.defaultdict viewvalues
32 changes: 16 additions & 16 deletions Tests/Tools/baselines/_sre.log
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
Implement rest of _sre module
IP VERSION AFFECTED: 2.7
FLAGS PASSED TO IPY.EXE: None
OPERATING SYSTEMS AFFECTED: All
DESCRIPTION
-------------------------------------------------------
Complete list of module attributes IronPython is still
missing implementations for:
_sre copyright # http://ironpython.codeplex.com/WorkItem/View.aspx?WorkItemId=17455
_sre getcodesize # http://ironpython.codeplex.com/WorkItem/View.aspx?WorkItemId=17455
Implement rest of _sre module


IP VERSION AFFECTED: 2.7
FLAGS PASSED TO IPY.EXE: None
OPERATING SYSTEMS AFFECTED: All

DESCRIPTION
-------------------------------------------------------
Complete list of module attributes IronPython is still
missing implementations for:
_sre copyright # http://ironpython.codeplex.com/WorkItem/View.aspx?WorkItemId=17455
_sre getcodesize # http://ironpython.codeplex.com/WorkItem/View.aspx?WorkItemId=17455



24 changes: 12 additions & 12 deletions Tests/Tools/baselines/_struct.log
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
Implement rest of _struct module
IP VERSION AFFECTED: 2.7
FLAGS PASSED TO IPY.EXE: None
OPERATING SYSTEMS AFFECTED: All
DESCRIPTION
-------------------------------------------------------
Complete list of module attributes that should be removed
from IronPython:
_struct _PY_STRUCT_OVERFLOW_MASKING
Implement rest of _struct module


IP VERSION AFFECTED: 2.7
FLAGS PASSED TO IPY.EXE: None
OPERATING SYSTEMS AFFECTED: All

DESCRIPTION
-------------------------------------------------------
Complete list of module attributes that should be removed
from IronPython:
_struct _PY_STRUCT_OVERFLOW_MASKING
28 changes: 14 additions & 14 deletions Tests/Tools/baselines/_subprocess.log
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
Implement rest of _subprocess module
IP VERSION AFFECTED: 2.7
FLAGS PASSED TO IPY.EXE: None
OPERATING SYSTEMS AFFECTED: All
DESCRIPTION
-------------------------------------------------------
Complete list of module attributes that should be removed
from IronPython:
_subprocess CREATE_NEW_PROCESS_GROUP
_subprocess PIPE
_subprocess STDOUT
Implement rest of _subprocess module


IP VERSION AFFECTED: 2.7
FLAGS PASSED TO IPY.EXE: None
OPERATING SYSTEMS AFFECTED: All

DESCRIPTION
-------------------------------------------------------
Complete list of module attributes that should be removed
from IronPython:
_subprocess CREATE_NEW_PROCESS_GROUP
_subprocess PIPE
_subprocess STDOUT
46 changes: 23 additions & 23 deletions Tests/Tools/baselines/_weakref.log
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
Implement rest of _weakref module
IP VERSION AFFECTED: 2.7
FLAGS PASSED TO IPY.EXE: None
OPERATING SYSTEMS AFFECTED: All
DESCRIPTION
-------------------------------------------------------
Complete list of module attributes IronPython is still
missing implementations for:
_weakref.CallableProxyType __cmp__ # http://ironpython.codeplex.com/WorkItem/View.aspx?WorkItemId=17463
_weakref.ProxyType __cmp__ # http://ironpython.codeplex.com/WorkItem/View.aspx?WorkItemId=17463
-------------------------------------------------------
Complete list of module attributes that should be removed
from IronPython:
_weakref.CallableProxyType __eq__ # http://ironpython.codeplex.com/WorkItem/View.aspx?WorkItemId=17463
_weakref.CallableProxyType __ne__ # http://ironpython.codeplex.com/WorkItem/View.aspx?WorkItemId=17463
_weakref.ProxyType __eq__ # http://ironpython.codeplex.com/WorkItem/View.aspx?WorkItemId=17463
_weakref.ProxyType __ne__ # http://ironpython.codeplex.com/WorkItem/View.aspx?WorkItemId=17463
Implement rest of _weakref module


IP VERSION AFFECTED: 2.7
FLAGS PASSED TO IPY.EXE: None
OPERATING SYSTEMS AFFECTED: All

DESCRIPTION
-------------------------------------------------------
Complete list of module attributes IronPython is still
missing implementations for:
_weakref.CallableProxyType __cmp__ # http://ironpython.codeplex.com/WorkItem/View.aspx?WorkItemId=17463
_weakref.ProxyType __cmp__ # http://ironpython.codeplex.com/WorkItem/View.aspx?WorkItemId=17463



-------------------------------------------------------
Complete list of module attributes that should be removed
from IronPython:
_weakref.CallableProxyType __eq__ # http://ironpython.codeplex.com/WorkItem/View.aspx?WorkItemId=17463
_weakref.CallableProxyType __ne__ # http://ironpython.codeplex.com/WorkItem/View.aspx?WorkItemId=17463
_weakref.ProxyType __eq__ # http://ironpython.codeplex.com/WorkItem/View.aspx?WorkItemId=17463
_weakref.ProxyType __ne__ # http://ironpython.codeplex.com/WorkItem/View.aspx?WorkItemId=17463
Loading