Skip to content

Replace use of imp with importlib.util #76

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 30, 2023
Merged

Replace use of imp with importlib.util #76

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 25 additions & 10 deletions paste/urlparser.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,12 @@
import os
import six
import sys
import imp

if six.PY2:
import imp
else:
import importlib.util as imputil

import mimetypes
try:
import pkg_resources
Expand Down Expand Up @@ -376,7 +381,6 @@ def load_module_from_name(environ, filename, module_name, errors):
return None
f.write('#\n')
f.close()
fp = None
if module_name in sys.modules:
return sys.modules[module_name]
if '.' in module_name:
Expand All @@ -386,14 +390,25 @@ def load_module_from_name(environ, filename, module_name, errors):
parent_name, errors)
else:
base_name = module_name
fp = None
try:
fp, pathname, stuff = imp.find_module(
base_name, [os.path.dirname(filename)])
module = imp.load_module(module_name, fp, pathname, stuff)
finally:
if fp is not None:
fp.close()
module = None

if six.PY2:
fp = None
try:
fp, pathname, stuff = imp.find_module(
base_name, [os.path.dirname(filename)])
module = imp.load_module(module_name, fp, pathname, stuff)
finally:
if fp is not None:
fp.close()
else:
# imp is deprecated and will be removed in Python 3.12
spec = imputil.spec_from_file_location(base_name, filename)
if spec is not None:
module = imputil.module_from_spec(spec)
sys.modules[base_name] = module
spec.loader.exec_module(module)

return module

def make_py(parser, environ, filename):
Expand Down