Remove use of setuptools Feature. Fixes #23
diff --git a/setup.py b/setup.py
index a5ca3ef..fcaeb12 100644
--- a/setup.py
+++ b/setup.py
@@ -1,6 +1,6 @@
import os
import sys
-from setuptools import setup, Extension, Feature
+from setuptools import setup, Extension
from distutils.command.build_ext import build_ext
from distutils.errors import CCompilerError, DistutilsExecError, \
DistutilsPlatformError
@@ -13,14 +13,6 @@
is_pypy = hasattr(sys, 'pypy_version_info')
-speedups = Feature(
- 'optional C speed-enhancement module',
- standard=True,
- ext_modules = [
- Extension('markupsafe._speedups', ['markupsafe/_speedups.c']),
- ],
-)
-
ext_errors = (CCompilerError, DistutilsExecError, DistutilsPlatformError)
if sys.platform == 'win32' and sys.version_info > (2, 6):
# 2.6's distutils.msvc9compiler can raise an IOError when failing to
@@ -61,9 +53,8 @@
def run_setup(with_binary):
- features = {}
- if with_binary:
- features['speedups'] = speedups
+ ext = Extension('markupsafe._speedups', ['markupsafe/_speedups.c'])
+ ext_modules = [ext] if with_binary else []
setup(
name='MarkupSafe',
version='0.18',
@@ -90,7 +81,7 @@
test_suite='markupsafe.tests.suite',
include_package_data=True,
cmdclass={'build_ext': ve_build_ext},
- features=features,
+ ext_modules=ext_modules,
)