Skip to content

Commit 05bc771

Browse files
author
Joseph Curtis
committed
Update imp to importlib for py3
1 parent 28b3361 commit 05bc771

File tree

6 files changed

+28
-7
lines changed

6 files changed

+28
-7
lines changed

docs/other/auto2to3.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,11 @@
1919
import argparse
2020
import os
2121
import sys
22-
import imp
22+
# imp was deprecated in python 3.6
23+
if sys.version_info >= (3, 6):
24+
import importlib as imp
25+
else:
26+
import imp
2327
import runpy
2428
from io import StringIO
2529
from pkgutil import ImpImporter, ImpLoader

src/future/backports/test/support.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,11 @@
2828
# import collections.abc # not present on Py2.7
2929
import re
3030
import subprocess
31-
import imp
31+
# imp was deprecated in python 3.6
32+
if sys.version_info >= (3, 6):
33+
import importlib as imp
34+
else:
35+
import imp
3236
import time
3337
try:
3438
import sysconfig

src/future/standard_library/__init__.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,11 @@
6262

6363
import sys
6464
import logging
65-
import imp
65+
# imp was deprecated in python 3.6
66+
if sys.version_info >= (3, 6):
67+
import importlib as imp
68+
else:
69+
import imp
6670
import contextlib
6771
import types
6872
import copy

src/past/builtins/misc.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,8 @@ def oct(number):
4242
return '0' + builtins.oct(number)[2:]
4343

4444
raw_input = input
45-
from imp import reload
45+
# imp was deprecated in python 3.6
46+
from importlib import reload
4647
unicode = str
4748
unichr = chr
4849
xrange = range

src/past/translation/__init__.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,15 @@
3232
Inspired by and based on ``uprefix`` by Vinay M. Sajip.
3333
"""
3434

35-
import imp
35+
import sys
36+
# imp was deprecated in python 3.6
37+
if sys.version_info >= (3, 6):
38+
import importlib as imp
39+
else:
40+
import imp
3641
import logging
3742
import marshal
3843
import os
39-
import sys
4044
import copy
4145
from lib2to3.pgen2.parse import ParseError
4246
from lib2to3.refactor import RefactoringTool

tests/test_future/test_standard_library.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -447,7 +447,11 @@ def test_reload(self):
447447
"""
448448
reload has been moved to the imp module
449449
"""
450-
import imp
450+
# imp was deprecated in python 3.6
451+
if sys.version_info >= (3, 6):
452+
import importlib as imp
453+
else:
454+
import imp
451455
imp.reload(imp)
452456
self.assertTrue(True)
453457

0 commit comments

Comments
 (0)