Skip to content

121 add line ending options#129

Closed
daira wants to merge 7 commits intomasterfrom
121-add-line-ending-options
Closed

121 add line ending options#129
daira wants to merge 7 commits intomasterfrom
121-add-line-ending-options

Conversation

@daira
Copy link
Contributor

@daira daira commented Oct 18, 2015

fixes #121

daira added 2 commits October 19, 2015 00:24
@daira
Allow tests to read/write files in binary mode, and to expect an erro…
3de7c2e 
…r return from main.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
@daira
Add options to override how line endings are written.
8b19490 
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
@daira
Minor cleanup to option parsing.
55e3399 
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
@daira
Copy link
Contributor Author

daira commented Oct 19, 2015

Wait, why isn't https://travis-ci.org/python-modernize/python-modernize/jobs/86099411 running test_newlines?

@daira
Add tests for newline options.
560a9b4 
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
@daira
Copy link
Contributor Author

daira commented Oct 19, 2015

Ah, because I forgot to add the file :-p

daira added 3 commits October 19, 2015 01:52
@daira
First attempt at fixing tests on Python 3.
c438d52 
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
@daira
Make output check simpler and more robust.
1cd9a5c 
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
@daira
Ugly fix for line endings on Python 3.
7cc58d1 
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
takluyver
takluyver reviewed Oct 19, 2015
View reviewed changes
libmodernize/main.py
Copy link
Contributor

@takluyver takluyver Oct 19, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure which I like less, changing an important value in the standard library or monkeypatching a private function in 2to3.

Copy link
Contributor Author

@daira daira Oct 19, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

An alternative approach is to do the refactor._to_system_newlines patch on Python 2 as well; I think that will work.

@takluyver
Copy link
Contributor

takluyver commented Oct 19, 2015

I think it's reasonable to offer users a way to explicitly set their preferred style of line endings, but I don't like the implementation based on monkeypatching stuff. I'm looking into how else it might be done.

@techtonik
Copy link
Contributor

techtonik commented Oct 19, 2015

@takluyver do we have information about which file is going to be processed and if it was processed?

@takluyver takluyver mentioned this pull request Oct 19, 2015
Closed
@daira
Copy link
Contributor Author

daira commented Oct 19, 2015

Closed in favour of either #130 or #131, depending on how we decide to do it.

@daira daira closed this Oct 19, 2015
@takluyver takluyver mentioned this pull request Oct 19, 2015
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Preserve line separator format (Unix vs. Windows)

3 participants

@daira @takluyver @techtonik