Merge pull request #1478 from minrk/setuptools-import-test

check for build_ext object in import check

Cython/Distutils/build_ext.py

@@ -2,16 +2,16 @@ import sys
 
 if 'setuptools' in sys.modules:
     try:
-        from setuptools.command import build_ext as _build_ext
+        from setuptools.command.build_ext import build_ext as _build_ext
     except ImportError:
         # We may be in the process of importing setuptools, which tries
         # to import this.
-        from distutils.command import build_ext as _build_ext
+        from distutils.command.build_ext import build_ext as _build_ext
 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):
         if self.distribution.ext_modules:
             from Cython.Build.Dependencies import cythonize

Cython/Distutils/old_build_ext.py

@@ -27,7 +27,7 @@ except Exception:
 if not from_setuptools and not from_pyximport:
     warnings.warn(
         "Cython.Distutils.old_build_ext does not properly handle dependencies "
-        "and is deprectated.")
+        "and is deprecated.")
 
 try:
     from __builtin__ import basestring