traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

bpo-21446: Update reload fixer to use importlib (GH-8391)

This commit is contained in:
Berker Peksag 2018-07-23 09:49:08 +03:00 committed by GitHub
parent d04f46c59f
commit 7a3056fa7d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Doc/library/2to3.rst
View File

@ -385,7 +385,7 @@ and off individually. They are described here in more detail.
.. 2to3fixer:: reload
Converts :func:`reload` to :func:`imp.reload`.
Converts :func:`reload` to :func:`importlib.reload`.
.. 2to3fixer:: renames

6
Lib/lib2to3/fixes/fix_reload.py
View File

@ -1,6 +1,6 @@
"""Fixer for reload().
reload(s) -> imp.reload(s)"""
reload(s) -> importlib.reload(s)"""
# Local imports
from .. import fixer_base
@ -32,7 +32,7 @@ class FixReload(fixer_base.BaseFix):
if (obj.type == self.syms.argument and
obj.children[0].value == '**'):
return # Make no change.
names = ('imp', 'reload')
names = ('importlib', 'reload')
new = ImportAndCall(node, results, names)
touch_import(None, 'imp', node)
touch_import(None, 'importlib', node)
return new

12
Lib/lib2to3/tests/test_fixers.py
View File

@ -290,30 +290,30 @@ class Test_reload(FixerTestCase):
def test(self):
b = """reload(a)"""
a = """import imp\nimp.reload(a)"""
a = """import importlib\nimportlib.reload(a)"""
self.check(b, a)
def test_comment(self):
b = """reload( a ) # comment"""
a = """import imp\nimp.reload( a ) # comment"""
a = """import importlib\nimportlib.reload( a ) # comment"""
self.check(b, a)
# PEP 8 comments
b = """reload( a ) # comment"""
a = """import imp\nimp.reload( a ) # comment"""
a = """import importlib\nimportlib.reload( a ) # comment"""
self.check(b, a)
def test_space(self):
b = """reload( a )"""
a = """import imp\nimp.reload( a )"""
a = """import importlib\nimportlib.reload( a )"""
self.check(b, a)
b = """reload( a)"""
a = """import imp\nimp.reload( a)"""
a = """import importlib\nimportlib.reload( a)"""
self.check(b, a)
b = """reload(a )"""
a = """import imp\nimp.reload(a )"""
a = """import importlib\nimportlib.reload(a )"""
self.check(b, a)
def test_unchanged(self):

2
Misc/NEWS.d/next/Library/2018-07-22-09-05-01.bpo-21446.w6g7tn.rst Normal file
View File

@ -0,0 +1,2 @@
The :2to3fixer:`reload` fixer now uses :func:`importlib.reload` instead of
deprecated :func:`imp.reload`.