Skip to content

Commit 61b1425

Browse files
committed
Make importlib.abc.SourceLoader the primary mechanism for importlib.
This required moving the class from importlib/abc.py into importlib/_bootstrap.py and jiggering some code to work better with the class. This included changing how the file finder worked to better meet import semantics. This also led to fixing importlib to handle the empty string from sys.path as import currently does (and making me wish we didn't support that instead just required people to insert '.' instead to represent cwd). It also required making the new set_data abstractmethod create any needed subdirectories implicitly thanks to __pycache__ (it was either this or grow the SourceLoader ABC to gain an 'exists' method and either a mkdir method or have set_data with no data arg mean to create a directory). Lastly, as an optimization the file loaders cache the file path where the finder found something to use for loading (this is thanks to having a sourceless loader separate from the source loader to simplify the code and cut out stat calls). Unfortunately test_runpy assumed a loader would always work for a module, even if you changed from underneath it what it was expected to work with. By simply dropping the previous loader in test_runpy so the proper loader can be returned by the finder fixed the failure. At this point importlib deviates from import on two points: 1. The exception raised when trying to import a file is different (import does an explicit file check to print a special message, importlib just says the path cannot be imported as if it was just some module name). 2. the co_filename on a code object is not being set to where bytecode was actually loaded from instead of where the marshalled code object originally came from (a solution for this has already been agreed upon on python-dev but has not been implemented yet; issue8611).
1 parent bb3565d commit 61b1425

17 files changed

+420
-544
lines changed

Doc/library/importlib.rst

+5-2
Original file line numberDiff line numberDiff line change
@@ -247,8 +247,11 @@ are also provided to help in implementing the core ABCs.
247247
.. method:: set_data(self, path, data)
248248

249249
Optional abstract method which writes the specified bytes to a file
250-
path. When writing to the path fails because the path is read-only, do
251-
not propagate the exception.
250+
path. Any intermediate directories which do not exist are to be created
251+
automatically.
252+
253+
When writing to the path fails because the path is read-only
254+
(:attr:`errno.EACCES`), do not propagate the exception.
252255

253256
.. method:: get_code(self, fullname)
254257

Lib/importlib/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ def _case_ok(directory, check):
3636
"""
3737
if 'PYTHONCASEOK' in os.environ:
3838
return True
39-
elif check in os.listdir(directory):
39+
elif check in os.listdir(directory if directory else os.getcwd()):
4040
return True
4141
return False
4242

0 commit comments

Comments
 (0)