From 61b14251d3a653548f70350acb250cf23b696372 Mon Sep 17 00:00:00 2001 From: Brett Cannon Date: Sat, 3 Jul 2010 21:48:25 +0000 Subject: 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). --- Lib/importlib/abc.py | 5 ----- 1 file changed, 5 deletions(-) (limited to 'Lib/importlib/abc.py') diff --git a/Lib/importlib/abc.py b/Lib/importlib/abc.py index a9cd3c8d27..6a7e3647bf 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) -- cgit v1.2.1