bpo-38681: Enhance 2to3 conversion for blank line by samtatasurya · Pull Request #17096 · python/cpython · GitHub
Skip to content

bpo-38681: Enhance 2to3 conversion for blank line - #17096

Closed
samtatasurya wants to merge 8 commits into
python:mainfrom
samtatasurya:fix-issue-38681
Closed

bpo-38681: Enhance 2to3 conversion for blank line#17096
samtatasurya wants to merge 8 commits into
python:mainfrom
samtatasurya:fix-issue-38681

Conversation

@samtatasurya

@samtatasurya samtatasurya commented Nov 9, 2019 •
edited by bedevere-bot
Loading

Copy link
Copy Markdown

Main changes

  1. Added a new helper function BlankLineOrPass, which replaces BlankLine in fix_future.py and fix_itertools_imports.py.
  2. Added optional keyword argument reformat to FixerTestCase.check function in test_fixers.py.

Example 1
Code to be converted:

try:
    from __future__ import with_statement
except ImportError:
    pass

Before enhancement:

 try:
-    from __future__ import with_statement
+    
 except ImportError:
     pass

After enhancement:

 try:
-    from __future__ import with_statement
+    pass
 except ImportError:
     pass

Example 2
Code to be converted:

if sys.version_info < (3, 0):
    from itertools import imap

Before enhancement:

 if sys.version_info < (3, 0):
-    from itertools import imap
+

After enhancement:

 if sys.version_info < (3, 0):
-    from itertools import imap
+    pass

https://bugs.python.org/issue38681

Samuel Tatasurya added 4 commits November 6, 2019 00:17
Samuel Tatasurya Samuel Tatasurya
1) Added a new function in fixer_util.py, BlankLineOrPass. 2) Modifie…
8e48b5d 
…d future and itertools_imports fixers to use BlankLineOrPass instead of BlankLine.
Samuel Tatasurya Samuel Tatasurya
Added test cases for 'future' and 'itertools_imports' fixers for Blan…
8c08166 
…kLineOrPass conversion.
Samuel Tatasurya Samuel Tatasurya
1) Added a new function in fixer_util.py, BlankLineOrPass. 2) Modifie…
13f11e5 
…d future and itertools_imports fixers to use BlankLineOrPass instead of BlankLine.
Samuel Tatasurya Samuel Tatasurya
Added test cases for 'future' and 'itertools_imports' fixers for Blan…
6b82ea0 
…kLineOrPass conversion.
@the-knights-who-say-ni

the-knights-who-say-ni commented Nov 9, 2019

Copy link
Copy Markdown

@rhettinger
rhettinger requested a review from benjaminp November 19, 2019 07:25
@csabella
csabella requested review from benjaminp and removed request for benjaminp January 25, 2020 13:44
isidentical
isidentical approved these changes Mar 7, 2020
View reviewed changes

@isidentical isidentical left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Looks great

Comment thread Lib/lib2to3/fixer_util.py Outdated
Comment thread Misc/NEWS.d/next/Library/2019-11-09-06-16-24.bpo-38681.jJobMS.rst Outdated
@isidentical
isidentical requested a review from pablogsal March 8, 2020 05:37
@iritkatriel

iritkatriel commented Oct 20, 2021 •
edited by bedevere-bot
Loading

Copy link
Copy Markdown
Member

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@isidentical isidentical isidentical approved these changes
@rhettinger rhettinger Awaiting requested review from rhettinger
@benjaminp benjaminp Awaiting requested review from benjaminp
@pablogsal pablogsal Awaiting requested review from pablogsal

Assignees

No one assigned

Labels

awaiting core review

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@samtatasurya @the-knights-who-say-ni @iritkatriel @isidentical @csabella @bedevere-bot