Commit be264974 authored by Stefan Behnel's avatar Stefan Behnel

simplify .py->.so loader setup in pyximport by reusing the already known path to the .so file

parent 1fe2e10c
...@@ -194,8 +194,9 @@ def build_module(name, pyxfilename, pyxbuild_dir=None, inplace=False, language_l ...@@ -194,8 +194,9 @@ def build_module(name, pyxfilename, pyxbuild_dir=None, inplace=False, language_l
return so_path return so_path
def load_module(name, pyxfilename, pyxbuild_dir=None, is_package=False, def load_module(name, pyxfilename, pyxbuild_dir=None, is_package=False,
build_inplace=False, language_level=None): build_inplace=False, language_level=None, so_path=None):
try: try:
if so_path is None:
if is_package: if is_package:
module_name = name + '.__init__' module_name = name + '.__init__'
else: else:
...@@ -203,6 +204,8 @@ def load_module(name, pyxfilename, pyxbuild_dir=None, is_package=False, ...@@ -203,6 +204,8 @@ def load_module(name, pyxfilename, pyxbuild_dir=None, is_package=False,
so_path = build_module(module_name, pyxfilename, pyxbuild_dir, so_path = build_module(module_name, pyxfilename, pyxbuild_dir,
inplace=build_inplace, language_level=language_level) inplace=build_inplace, language_level=language_level)
mod = imp.load_dynamic(name, so_path) mod = imp.load_dynamic(name, so_path)
if is_package and not hasattr(mod, '__path__'):
mod.__path__ = os.path.dirname(so_path)
assert mod.__file__ == so_path, (mod.__file__, so_path) assert mod.__file__ == so_path, (mod.__file__, so_path)
except Exception: except Exception:
if pyxargs.load_py_module_on_import_failure and pyxfilename.endswith('.py'): if pyxargs.load_py_module_on_import_failure and pyxfilename.endswith('.py'):
...@@ -309,8 +312,8 @@ class PyImporter(PyxImporter): ...@@ -309,8 +312,8 @@ class PyImporter(PyxImporter):
self.super.__init__(extension='.py', pyxbuild_dir=pyxbuild_dir, inplace=inplace, self.super.__init__(extension='.py', pyxbuild_dir=pyxbuild_dir, inplace=inplace,
language_level=language_level) language_level=language_level)
self.uncompilable_modules = {} self.uncompilable_modules = {}
self.blocked_modules = ['Cython', 'distutils.extension', self.blocked_modules = ['Cython', 'pyxbuild', 'pyximport.pyxbuild',
'distutils.sysconfig'] 'distutils.extension', 'distutils.sysconfig']
def find_module(self, fullname, package_path=None): def find_module(self, fullname, package_path=None):
if fullname in sys.modules: if fullname in sys.modules:
...@@ -320,6 +323,8 @@ class PyImporter(PyxImporter): ...@@ -320,6 +323,8 @@ class PyImporter(PyxImporter):
if fullname in self.blocked_modules: if fullname in self.blocked_modules:
# prevent infinite recursion # prevent infinite recursion
return None return None
if _lib_loader.knows(fullname):
return _lib_loader
_debug("trying import of module '%s'", fullname) _debug("trying import of module '%s'", fullname)
if fullname in self.uncompilable_modules: if fullname in self.uncompilable_modules:
path, last_modified = self.uncompilable_modules[fullname] path, last_modified = self.uncompilable_modules[fullname]
...@@ -336,7 +341,6 @@ class PyImporter(PyxImporter): ...@@ -336,7 +341,6 @@ class PyImporter(PyxImporter):
try: try:
importer = self.super.find_module(fullname, package_path) importer = self.super.find_module(fullname, package_path)
if importer is not None: if importer is not None:
try:
if importer.init_path: if importer.init_path:
path = importer.init_path path = importer.init_path
real_name = fullname + '.__init__' real_name = fullname + '.__init__'
...@@ -344,11 +348,16 @@ class PyImporter(PyxImporter): ...@@ -344,11 +348,16 @@ class PyImporter(PyxImporter):
path = importer.path path = importer.path
real_name = fullname real_name = fullname
_debug("importer found path %s for module %s", path, real_name) _debug("importer found path %s for module %s", path, real_name)
build_module(real_name, path, try:
so_path = build_module(
real_name, path,
pyxbuild_dir=self.pyxbuild_dir, pyxbuild_dir=self.pyxbuild_dir,
language_level=self.language_level, language_level=self.language_level,
inplace=self.inplace) inplace=self.inplace)
except Exception, e: _lib_loader.add_lib(fullname, path, so_path,
is_package=bool(importer.init_path))
return _lib_loader
except Exception:
if DEBUG_IMPORT: if DEBUG_IMPORT:
import traceback import traceback
traceback.print_exc() traceback.print_exc()
...@@ -363,6 +372,25 @@ class PyImporter(PyxImporter): ...@@ -363,6 +372,25 @@ class PyImporter(PyxImporter):
self.blocked_modules.pop() self.blocked_modules.pop()
return importer return importer
class LibLoader(object):
def __init__(self):
self._libs = {}
def load_module(self, fullname):
try:
source_path, so_path, is_package = self._libs[fullname]
except KeyError:
raise ValueError("invalid module %s" % fullname)
return load_module(fullname, source_path, so_path=so_path, is_package=is_package)
def add_lib(self, fullname, path, so_path, is_package):
self._libs[fullname] = (path, so_path, is_package)
def knows(self, fullname):
return fullname in self._libs
_lib_loader = LibLoader()
class PyxLoader(object): class PyxLoader(object):
def __init__(self, fullname, path, init_path=None, pyxbuild_dir=None, def __init__(self, fullname, path, init_path=None, pyxbuild_dir=None,
inplace=False, language_level=None): inplace=False, language_level=None):
...@@ -481,7 +509,7 @@ def install(pyximport=True, pyimport=False, build_dir=None, build_in_temp=True, ...@@ -481,7 +509,7 @@ def install(pyximport=True, pyimport=False, build_dir=None, build_in_temp=True,
py_importer = PyImporter(pyxbuild_dir=build_dir, inplace=inplace, py_importer = PyImporter(pyxbuild_dir=build_dir, inplace=inplace,
language_level=language_level) language_level=language_level)
# make sure we import Cython before we install the import hook # make sure we import Cython before we install the import hook
import pyximport.pyxbuild, Cython.Compiler.Main, Cython.Compiler.Pipeline, Cython.Compiler.Optimize import Cython.Compiler.Main, Cython.Compiler.Pipeline, Cython.Compiler.Optimize
sys.meta_path.insert(0, py_importer) sys.meta_path.insert(0, py_importer)
if pyximport and not has_pyx_importer: if pyximport and not has_pyx_importer:
......
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