Reformat idlelib colorizer #25479
Merged
Reformat idlelib colorizer #25479
Conversation
This file contains hidden or 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
terryjreedy
requested changes
Apr 22, 2021
Lib/idlelib/colorizer.py
Outdated
| def make_pat(): | ||
| kw = r"\b" + any("KEYWORD", keyword.kwlist) + r"\b" | ||
| builtinlist = [str(name) for name in dir(builtins) | ||
| if not name.startswith('_') and \ | ||
| name not in keyword.kwlist] | ||
| if not name.startswith('_') and \ |
Lib/idlelib/colorizer.py
Outdated
| @@ -25,12 +27,14 @@ def make_pat(): | |||
| sq3string = stringprefix + r"'''[^'\\]*((\\.|'(?!''))[^'\\]*)*(''')?" | |||
| dq3string = stringprefix + r'"""[^"\\]*((\\.|"(?!""))[^"\\]*)*(""")?' | |||
| string = any("STRING", [sq3string, dq3string, sqstring, dqstring]) | |||
| return kw + "|" + builtin + "|" + comment + "|" + string +\ | |||
| return kw + "|" + builtin + "|" + comment + "|" + string + \ | |||
There was a problem hiding this comment.
Backslash can be avoided with ()s.
Lib/idlelib/colorizer.py
Outdated
| "hit": idleConf.GetHighlight(theme, "hit"), | ||
| } | ||
| } |
There was a problem hiding this comment.
Original was equally acceptible in PEP 8. I will revert.
Lib/idlelib/colorizer.py
Outdated
| @@ -215,7 +222,7 @@ def recolorize(self): | |||
| t0 = time.perf_counter() | |||
| self.recolorize_main() | |||
| t1 = time.perf_counter() | |||
| if DEBUG: print("%.3f seconds" % (t1-t0)) | |||
| if DEBUG: print("%.3f seconds" % (t1 - t0)) | |||
There was a problem hiding this comment.
Spaces are not required or even wrong. "c = (a + b) * (a - b)" is labelled 'wrong'.
Lib/idlelib/colorizer.py
Outdated
| @@ -316,7 +323,7 @@ def _color_delegator(parent): # htest # | |||
| "b'x',B'x', br'x',Br'x',bR'x',BR'x', rb'x', rB'x',Rb'x',RB'x'\n" | |||
| "# Invalid combinations of legal characters should be half colored.\n" | |||
| "ur'x', ru'x', uf'x', fu'x', UR'x', ufr'x', rfu'x', xf'x', fx'x'\n" | |||
| ) | |||
| ) | |||
terryjreedy
approved these changes
Apr 23, 2021
|
Thanks @E-Paine for the PR, and @terryjreedy for merging it 🌮🎉.. I'm working now to backport this PR to: 3.8, 3.9. |
miss-islington
pushed a commit
to miss-islington/cpython
that referenced
this pull request
Apr 23, 2021
Also replace if-then and and-or with conditional expressions. Co-authored-by: Terry Jan Reedy <tjreedy@udel.edu> (cherry picked from commit 702a088) Co-authored-by: E-Paine <63801254+E-Paine@users.noreply.github.com>
|
GH-25547 is a backport of this pull request to the 3.9 branch. |
miss-islington
pushed a commit
to miss-islington/cpython
that referenced
this pull request
Apr 23, 2021
Also replace if-then and and-or with conditional expressions. Co-authored-by: Terry Jan Reedy <tjreedy@udel.edu> (cherry picked from commit 702a088) Co-authored-by: E-Paine <63801254+E-Paine@users.noreply.github.com>
|
GH-25548 is a backport of this pull request to the 3.8 branch. |
miss-islington
added a commit
that referenced
this pull request
Apr 23, 2021
Also replace if-then and and-or with conditional expressions. Co-authored-by: Terry Jan Reedy <tjreedy@udel.edu> (cherry picked from commit 702a088) Co-authored-by: E-Paine <63801254+E-Paine@users.noreply.github.com>
terryjreedy
pushed a commit
that referenced
this pull request
Apr 23, 2021
Also replace if-then and and-or with conditional expressions. Co-authored-by: Terry Jan Reedy <tjreedy@udel.edu> (cherry picked from commit 702a088) Co-authored-by: E-Paine <63801254+E-Paine@users.noreply.github.com> Co-authored-by: E-Paine <63801254+E-Paine@users.noreply.github.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Minor reformatting, some of which was taken from #22682