summaryrefslogtreecommitdiffstats
path: root/Lib/importlib/abc.py
diff options
context:
space:
mode:
authorBrett Cannon <bcannon@gmail.com>2010-07-03 21:48:25 (GMT)
committerBrett Cannon <bcannon@gmail.com>2010-07-03 21:48:25 (GMT)
commit61b14251d3a653548f70350acb250cf23b696372 (patch)
tree9dbdafe3978baaf50d45c2353816cf2f484e8b11 /Lib/importlib/abc.py
parentbb3565d412c01d4ec8613500293aec66a6743568 (diff)
downloadcpython-61b14251d3a653548f70350acb250cf23b696372.zip
cpython-61b14251d3a653548f70350acb250cf23b696372.tar.gz
cpython-61b14251d3a653548f70350acb250cf23b696372.tar.bz2
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).
Diffstat (limited to 'Lib/importlib/abc.py')
-rw-r--r--Lib/importlib/abc.py5
1 files changed, 0 insertions, 5 deletions
diff --git a/Lib/importlib/abc.py b/Lib/importlib/abc.py
index a9cd3c8..6a7e364 100644
--- a/Lib/importlib/abc.py
+++ b/Lib/importlib/abc.py
@@ -182,8 +182,6 @@ class PyLoader(SourceLoader):
else:
return path
-PyLoader.register(_bootstrap.PyLoader)
-
class PyPycLoader(PyLoader):
@@ -266,7 +264,6 @@ class PyPycLoader(PyLoader):
self.write_bytecode(fullname, data)
return code_object
-
@abc.abstractmethod
def source_mtime(self, fullname:str) -> int:
"""Abstract method which when implemented should return the
@@ -285,5 +282,3 @@ class PyPycLoader(PyLoader):
bytecode for the module, returning a boolean representing whether the
bytecode was written or not."""
raise NotImplementedError
-
-PyPycLoader.register(_bootstrap.PyPycLoader)