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
8a0d686b
Commit
8a0d686b
authored
8 years ago
by
Robert Bradshaw
Committed by
GitHub
8 years ago
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #1478 from minrk/setuptools-import-test
check for build_ext object in import check
parents
e53e5b09
a88de562
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
5 deletions
+5
-5
Cython/Distutils/build_ext.py
Cython/Distutils/build_ext.py
+4
-4
Cython/Distutils/old_build_ext.py
Cython/Distutils/old_build_ext.py
+1
-1
No files found.
Cython/Distutils/build_ext.py
View file @
8a0d686b
...
@@ -2,16 +2,16 @@ import sys
...
@@ -2,16 +2,16 @@ import sys
if
'setuptools'
in
sys
.
modules
:
if
'setuptools'
in
sys
.
modules
:
try
:
try
:
from
setuptools.command
import
build_ext
as
_build_ext
from
setuptools.command
.build_ext
import
build_ext
as
_build_ext
except
ImportError
:
except
ImportError
:
# We may be in the process of importing setuptools, which tries
# We may be in the process of importing setuptools, which tries
# to import this.
# to import this.
from
distutils.command
import
build_ext
as
_build_ext
from
distutils.command
.build_ext
import
build_ext
as
_build_ext
else
:
else
:
from
distutils.command
import
build_ext
as
_build_ext
from
distutils.command
.build_ext
import
build_ext
as
_build_ext
class
build_ext
(
_build_ext
.
build_ext
,
object
):
class
build_ext
(
_build_ext
,
object
):
def
finalize_options
(
self
):
def
finalize_options
(
self
):
if
self
.
distribution
.
ext_modules
:
if
self
.
distribution
.
ext_modules
:
from
Cython.Build.Dependencies
import
cythonize
from
Cython.Build.Dependencies
import
cythonize
...
...
This diff is collapsed.
Click to expand it.
Cython/Distutils/old_build_ext.py
View file @
8a0d686b
...
@@ -27,7 +27,7 @@ except Exception:
...
@@ -27,7 +27,7 @@ except Exception:
if
not
from_setuptools
and
not
from_pyximport
:
if
not
from_setuptools
and
not
from_pyximport
:
warnings
.
warn
(
warnings
.
warn
(
"Cython.Distutils.old_build_ext does not properly handle dependencies "
"Cython.Distutils.old_build_ext does not properly handle dependencies "
"and is deprec
t
ated."
)
"and is deprecated."
)
try
:
try
:
from
__builtin__
import
basestring
from
__builtin__
import
basestring
...
...
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