diff options
| author | Berker Peksag <berker.peksag@gmail.com> | 2018-07-23 06:49:08 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-23 06:49:08 (GMT) |
| commit | 7a3056fa7dd1223fe7112e53b236c43d71f33f64 (patch) | |
| tree | 49655b874eca985714b2fda7e0a770636f74c81b | |
| parent | d04f46c59f1d07d9bcc0ba910741296ac88d370d (diff) | |
| download | cpython-7a3056fa7dd1223fe7112e53b236c43d71f33f64.zip cpython-7a3056fa7dd1223fe7112e53b236c43d71f33f64.tar.gz cpython-7a3056fa7dd1223fe7112e53b236c43d71f33f64.tar.bz2 | |
bpo-21446: Update reload fixer to use importlib (GH-8391)
| -rw-r--r-- | Doc/library/2to3.rst | 2 | ||||
| -rw-r--r-- | Lib/lib2to3/fixes/fix_reload.py | 6 | ||||
| -rw-r--r-- | Lib/lib2to3/tests/test_fixers.py | 12 | ||||
| -rw-r--r-- | Misc/NEWS.d/next/Library/2018-07-22-09-05-01.bpo-21446.w6g7tn.rst | 2 |
4 files changed, 12 insertions, 10 deletions
diff --git a/Doc/library/2to3.rst b/Doc/library/2to3.rst index deb5e10..fa4b0a9 100644 --- a/Doc/library/2to3.rst +++ b/Doc/library/2to3.rst @@ -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 diff --git a/Lib/lib2to3/fixes/fix_reload.py b/Lib/lib2to3/fixes/fix_reload.py index 5bec7d5..6c7fbbd 100644 --- a/Lib/lib2to3/fixes/fix_reload.py +++ b/Lib/lib2to3/fixes/fix_reload.py @@ -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 diff --git a/Lib/lib2to3/tests/test_fixers.py b/Lib/lib2to3/tests/test_fixers.py index bfe7a23..8cecf3c 100644 --- a/Lib/lib2to3/tests/test_fixers.py +++ b/Lib/lib2to3/tests/test_fixers.py @@ -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): diff --git a/Misc/NEWS.d/next/Library/2018-07-22-09-05-01.bpo-21446.w6g7tn.rst b/Misc/NEWS.d/next/Library/2018-07-22-09-05-01.bpo-21446.w6g7tn.rst new file mode 100644 index 0000000..81da4a6 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2018-07-22-09-05-01.bpo-21446.w6g7tn.rst @@ -0,0 +1,2 @@ +The :2to3fixer:`reload` fixer now uses :func:`importlib.reload` instead of +deprecated :func:`imp.reload`. |