Skip to content

/ bpython

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.

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

Fix 625 #627

Merged
merged 7 commits into from Sep 2, 2016
Merged

Fix 625 #627

merged 7 commits into from Sep 2, 2016

Conversation

@thomasballinger
Copy link
Member

thomasballinger commented Jul 29, 2016 •
edited

fixing #625 by not adding encoding lines to source files.
@thomasballinger
commit test
27c041f
@thomasballinger
fix Python 2 running encoded source files
dfb44cf
@thomasballinger
correct linenums for external files
Loading status checks…
df29ae1
@thomasballinger
fix test for early 2.7
Loading status checks…
ebeffd7
@thomasballinger
add auto default to runsource
Loading status checks…
a2a934c
@thomasballinger
Copy link
Member Author

thomasballinger commented Aug 4, 2016

Add a new default value for runsource(encode='auto'), which uses whether the filename is None to determine whether input is coming from an interactive interface and therefore needs to have an encoding comment added.

Add test for every combination of (unicode/bytestring x encoding comment/none x encode=True/False/'auto'). Some combinations are invalid and raise ValueErrors.
@thomasballinger
fix runsource test for pypy
Loading status checks…
0a4344e 
Pypy has slightly different syntax error message for
an encoding comment being present in a unicode string
This was referenced Aug 4, 2016
Closed
Closed
bpython/inspection.py Outdated
@@ -284,6 +284,7 @@ def is_callable(obj):


get_encoding_re = LazyReCompile(r'coding[:=]\s*([-\w.]+)')
get_encoding_line_re = LazyReCompile(r'^.*coding[:=]\s*[-\w.]+.*$')

This comment has been minimized.

Sign in to view
@sebastinas

sebastinas Aug 8, 2016

Contributor

So why do we need that twice?

This comment has been minimized.

Sign in to view
@thomasballinger

thomasballinger Aug 8, 2016

Author Member

I can combine these
@thomasballinger
combine res
Loading status checks…
9a88e73
@sebastinas
Copy link
Contributor

sebastinas commented Aug 27, 2016

LGTM
@thomasballinger thomasballinger merged commit 9a88e73 into master Sep 2, 2016
2 checks passed
2 checks passed
continuous-integration/travis-ci/pr The Travis CI build passed
Details
continuous-integration/travis-ci/push The Travis CI build passed
Details
@Trundle Trundle mentioned this pull request Oct 10, 2016
Closed
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
Linked issues

Successfully merging this pull request may close these issues.

None yet

2 participants
@thomasballinger @sebastinas
You can’t perform that action at this time.