Commit 16475adc authored by Brett Cannon's avatar Brett Cannon

Issue #13959: Re-implement imp.load_source() in imp.py.

parent 4132368d
...@@ -14,7 +14,7 @@ from _imp import (lock_held, acquire_lock, release_lock, reload, ...@@ -14,7 +14,7 @@ from _imp import (lock_held, acquire_lock, release_lock, reload,
from _imp import (get_magic, get_tag, get_suffixes, cache_from_source, from _imp import (get_magic, get_tag, get_suffixes, cache_from_source,
source_from_cache) source_from_cache)
# Should be re-implemented here (and mostly deprecated) # Should be re-implemented here (and mostly deprecated)
from _imp import (find_module, load_compiled, load_source, NullImporter, from _imp import (find_module, load_compiled, NullImporter,
SEARCH_ERROR, PY_SOURCE, PY_COMPILED, C_EXTENSION, SEARCH_ERROR, PY_SOURCE, PY_COMPILED, C_EXTENSION,
PY_RESOURCE, PKG_DIRECTORY, C_BUILTIN, PY_FROZEN, PY_RESOURCE, PKG_DIRECTORY, C_BUILTIN, PY_FROZEN,
PY_CODERESOURCE, IMP_HOOK) PY_CODERESOURCE, IMP_HOOK)
...@@ -25,6 +25,33 @@ from importlib import _bootstrap ...@@ -25,6 +25,33 @@ from importlib import _bootstrap
import os import os
class _LoadSourceCompatibility(_bootstrap._SourceFileLoader):
"""Compatibility support for implementing load_source()."""
def __init__(self, fullname, path, file=None):
super().__init__(fullname, path)
self.file = file
def get_data(self, path):
"""Gross hack to contort SourceFileLoader to deal w/ load_source()'s bad
API."""
if path == self._path:
with self.file:
# Technically should be returning bytes, but
# SourceLoader.get_code() just passed what is returned to
# compile() which can handle str. And converting to bytes would
# require figuring out the encoding to decode to and
# tokenize.detect_encoding() only accepts bytes.
return self.file.read()
else:
return super().get_data(path)
def load_source(name, pathname, file=None):
return _LoadSourceCompatibility(name, pathname, file).load_module(name)
def load_package(name, path): def load_package(name, path):
if os.path.isdir(path): if os.path.isdir(path):
extensions = _bootstrap._suffix_list(PY_SOURCE) extensions = _bootstrap._suffix_list(PY_SOURCE)
......
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment