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
Labels
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
nexedi
cython
Commits
3719264b
Commit
3719264b
authored
9 years ago
by
scoder
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #380 from jdemeyer/fix_cimport_cpython
Fix relative cimport for Cython package dirs
parents
3bfdb38f
2982a995
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
Cython/Build/Dependencies.py
Cython/Build/Dependencies.py
+2
-2
No files found.
Cython/Build/Dependencies.py
View file @
3719264b
...
@@ -45,7 +45,7 @@ except ImportError:
...
@@ -45,7 +45,7 @@ except ImportError:
from
distutils.extension
import
Extension
from
distutils.extension
import
Extension
from
..
import
Utils
from
..
import
Utils
from
..Utils
import
cached_function
,
cached_method
,
path_exists
,
find_root_package_dir
from
..Utils
import
cached_function
,
cached_method
,
path_exists
,
find_root_package_dir
,
is_package_dir
from
..Compiler.Main
import
Context
,
CompilationOptions
,
default_options
from
..Compiler.Main
import
Context
,
CompilationOptions
,
default_options
join_path
=
cached_function
(
os
.
path
.
join
)
join_path
=
cached_function
(
os
.
path
.
join
)
...
@@ -383,7 +383,7 @@ def resolve_depend(depend, include_dirs):
...
@@ -383,7 +383,7 @@ def resolve_depend(depend, include_dirs):
@
cached_function
@
cached_function
def
package
(
filename
):
def
package
(
filename
):
dir
=
os
.
path
.
dirname
(
os
.
path
.
abspath
(
str
(
filename
)))
dir
=
os
.
path
.
dirname
(
os
.
path
.
abspath
(
str
(
filename
)))
if
dir
!=
filename
and
path_exists
(
join_path
(
dir
,
'__init__.py'
)
):
if
dir
!=
filename
and
is_package_dir
(
dir
):
return
package
(
dir
)
+
(
os
.
path
.
basename
(
dir
),)
return
package
(
dir
)
+
(
os
.
path
.
basename
(
dir
),)
else
:
else
:
return
()
return
()
...
...
This diff is collapsed.
Click to expand it.
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