Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Gwenaël Samain
cython
Commits
be264974
Commit
be264974
authored
Aug 06, 2012
by
Stefan Behnel
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
simplify .py->.so loader setup in pyximport by reusing the already known path to the .so file
parent
1fe2e10c
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
50 additions
and
22 deletions
+50
-22
pyximport/pyximport.py
pyximport/pyximport.py
+50
-22
No files found.
pyximport/pyximport.py
View file @
be264974
...
@@ -194,15 +194,18 @@ def build_module(name, pyxfilename, pyxbuild_dir=None, inplace=False, language_l
...
@@ -194,15 +194,18 @@ 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
is_package
:
if
so_path
is
None
:
module_name
=
name
+
'.__init__'
if
is_package
:
else
:
module_name
=
name
+
'.__init__'
module_name
=
name
else
:
so_path
=
build_module
(
module_name
,
pyxfilename
,
pyxbuild_dir
,
module_name
=
name
inplace
=
build_inplace
,
language_level
=
language_level
)
so_path
=
build_module
(
module_name
,
pyxfilename
,
pyxbuild_dir
,
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,19 +341,23 @@ class PyImporter(PyxImporter):
...
@@ -336,19 +341,23 @@ 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
:
if
importer
.
init_path
:
path
=
importer
.
init_path
real_name
=
fullname
+
'.__init__'
else
:
path
=
importer
.
path
real_name
=
fullname
_debug
(
"importer found path %s for module %s"
,
path
,
real_name
)
try
:
try
:
if
importer
.
init_path
:
so_path
=
build_module
(
path
=
importer
.
init_path
real_name
,
path
,
real_name
=
fullname
+
'.__init__'
pyxbuild_dir
=
self
.
pyxbuild_dir
,
else
:
language_level
=
self
.
language_level
,
path
=
importer
.
path
inplace
=
self
.
inplace
)
real_name
=
fullname
_lib_loader
.
add_lib
(
fullname
,
path
,
so_path
,
_debug
(
"importer found path %s for module %s"
,
path
,
real_name
)
is_package
=
bool
(
importer
.
init_path
))
build_module
(
real_name
,
path
,
return
_lib_loader
pyxbuild_dir
=
self
.
pyxbuild_dir
,
except
Exception
:
language_level
=
self
.
language_level
,
inplace
=
self
.
inplace
)
except
Exception
,
e
:
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
:
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment