Merge c50feb0 into f527577

setup.py

@@ -28,7 +28,6 @@
 from setuptools import setup
 from setuptools import find_packages
 from setuptools import Extension
-from setuptools import Feature
 
 from setuptools.command.build_ext import build_ext
 
@@ -64,26 +63,22 @@ def read(*rnames):
         return f.read()
 
 
-codeoptimization = Feature(
-    "Optional code optimizations",
-    standard=True,
-    ext_modules=[
+codeoptimization = [
         Extension(
             "zope.hookable._zope_hookable",
             [os.path.join('src', 'zope', 'hookable', "_zope_hookable.c")],
         ),
-    ],
-)
+]
 
 is_pypy_or_jython = platform.python_implementation() in ('PyPy', 'Jython')
 
 # Jython cannot build the C optimizations, while on PyPy they are
 # anti-optimizations (the C extension compatibility layer is known-slow,
 # and defeats JIT opportunities).
 if is_pypy_or_jython:
-    features = {}
+    ext_modules = {}
 else:
-    features = {'codeoptimization': codeoptimization}
+    ext_modules = codeoptimization
 
 TESTS_REQUIRE = [
     'zope.testing',
@@ -117,7 +112,7 @@ def read(*rnames):
           "Framework :: Zope :: 3",
           "Topic :: Software Development :: Libraries :: Python Modules",
       ],
-      features=features,
+      ext_modules=ext_modules,
       cmdclass={
           'build_ext': optional_build_ext,
       },