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
Xavier Thompson
cython
Commits
65d02f4d
Commit
65d02f4d
authored
Oct 28, 2018
by
Kryštof Pilnáček
Committed by
Stefan Behnel
Nov 01, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix: absolute cimport handling
parent
867c9a5f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
3 deletions
+15
-3
Cython/Build/Dependencies.py
Cython/Build/Dependencies.py
+11
-2
tests/run/cimport.srctree
tests/run/cimport.srctree
+4
-1
No files found.
Cython/Build/Dependencies.py
View file @
65d02f4d
...
@@ -399,6 +399,8 @@ dependency_regex = re.compile(r"(?:^\s*from +([0-9a-zA-Z_.]+) +cimport)|"
...
@@ -399,6 +399,8 @@ dependency_regex = re.compile(r"(?:^\s*from +([0-9a-zA-Z_.]+) +cimport)|"
r"(?:^\
s*cimpo
rt +([0-9a-zA-Z_.]+(?: *, *[0-9a-zA-Z_.]+)*))|"
r"(?:^\
s*cimpo
rt +([0-9a-zA-Z_.]+(?: *, *[0-9a-zA-Z_.]+)*))|"
r"(?:^\
s*cde
f +extern +from +['\"]([^'\"]+)['\"])|"
r"(?:^\
s*cde
f +extern +from +['\"]([^'\"]+)['\"])|"
r"(?:^\
s*i
nclude +['\"]([^'\"]+)['\"])"
,
re
.
M
)
r"(?:^\
s*i
nclude +['\"]([^'\"]+)['\"])"
,
re
.
M
)
dependency_after_from_regex
=
re
.
compile
(
r"(?:^\
s+
\(((?:[0-9a-zA-Z_., ]*\n)*)\
)
\n)|"
r"(?:^\
s+((?:[
0-9a-zA-Z_., ]*))\n)"
)
def
normalize_existing
(
base_path
,
rel_paths
):
def
normalize_existing
(
base_path
,
rel_paths
):
...
@@ -488,6 +490,13 @@ def parse_dependencies(source_filename):
...
@@ -488,6 +490,13 @@ def parse_dependencies(source_filename):
cimport_from
,
cimport_list
,
extern
,
include
=
m
.
groups
()
cimport_from
,
cimport_list
,
extern
,
include
=
m
.
groups
()
if
cimport_from
:
if
cimport_from
:
cimports
.
append
(
cimport_from
)
cimports
.
append
(
cimport_from
)
m_after_from
=
dependency_after_from_regex
.
search
(
source
[
m
.
end
():])
if
m
:
multiline
,
one_line
=
m_after_from
.
groups
()
subimports
=
multiline
or
one_line
cimports
.
extend
(
"{}.{}"
.
format
(
cimport_from
,
s
.
strip
())
for
s
in
subimports
.
split
(
','
))
elif
cimport_list
:
elif
cimport_list
:
cimports
.
extend
(
x
.
strip
()
for
x
in
cimport_list
.
split
(
","
))
cimports
.
extend
(
x
.
strip
()
for
x
in
cimport_list
.
split
(
","
))
elif
extern
:
elif
extern
:
...
@@ -584,14 +593,14 @@ class DependencyTree(object):
...
@@ -584,14 +593,14 @@ class DependencyTree(object):
pxd_list
=
[
filename
[:
-
4
]
+
'.pxd'
]
pxd_list
=
[
filename
[:
-
4
]
+
'.pxd'
]
else
:
else
:
pxd_list
=
[]
pxd_list
=
[]
# Cimports generates all possible combinations package.module
# when imported as from package cimport module.
for
module
in
self
.
cimports
(
filename
):
for
module
in
self
.
cimports
(
filename
):
if
module
[:
7
]
==
'cython.'
or
module
==
'cython'
:
if
module
[:
7
]
==
'cython.'
or
module
==
'cython'
:
continue
continue
pxd_file
=
self
.
find_pxd
(
module
,
filename
)
pxd_file
=
self
.
find_pxd
(
module
,
filename
)
if
pxd_file
is
not
None
:
if
pxd_file
is
not
None
:
pxd_list
.
append
(
pxd_file
)
pxd_list
.
append
(
pxd_file
)
elif
not
self
.
quiet
:
print
(
"%s: cannot find cimported module '%s'"
%
(
filename
,
module
))
return
tuple
(
pxd_list
)
return
tuple
(
pxd_list
)
@
cached_method
@
cached_method
...
...
tests/run/cimport.srctree
View file @
65d02f4d
...
@@ -41,7 +41,10 @@ ctypedef int my_int
...
@@ -41,7 +41,10 @@ ctypedef int my_int
######## a.pyx ########
######## a.pyx ########
from other cimport A, foo
from other cimport (
A,
foo,
)
print A, foo(10)
print A, foo(10)
cimport other
cimport other
...
...
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