Drop custom build step for excluding ssl_pyopenssl module from Python…

… 3 builds. Ref cherrypy#1399. Fixes cherrypy#1149.

CHANGES.rst

@@ -1,3 +1,12 @@
+v8.5.0
+-----
+
+* The pyOpenSSL support is now included on Python 3 builds,
+  removing the last disparity between Python 2 and Python 3
+  in the CherryPy package. This change is one small step
+  in consideration of #1399. This change also fixes RPM
+  builds, as reported in #1149.
+
 v8.4.0
 -----
 

setup.py

@@ -1,8 +1,6 @@
 import sys
-import re
 import io
 from distutils.command.install import INSTALL_SCHEMES
-from distutils.command.build_py import build_py
 
 import setuptools
 
@@ -11,20 +9,6 @@
 pytest_runner = ['pytest_runner'] if needs_pytest else []
 
 
-class cherrypy_build_py(build_py):
-    """Custom version of build_py that excludes Python-specific modules"""
-
-    def build_module(self, module, module_file, package):
-        python3 = sys.version_info >= (3,)
-        if python3:
-            exclude_pattern = re.compile('ssl_pyopenssl')
-        else:
-            exclude_pattern = re.compile('xxx')
-        if exclude_pattern.match(module):
-            return  # skip it
-        return build_py.build_module(self, module, module_file, package)
-
-
 ###############################################################################
 # arguments for the setup command
 ###############################################################################
@@ -142,10 +126,6 @@ def build_module(self, module, module_file, package):
         'mock'  # accessed through cherrypy.test.helper.mock
     )
 
-cmd_class = {
-    'build_py': cherrypy_build_py,
-}
-
 if sys.version_info >= (3, 0):
     required_python_version = '3.1'
 else:
@@ -175,7 +155,6 @@ def build_module(self, module, module_file, package):
     packages=packages,
     data_files=data_files,
     scripts=scripts,
-    cmdclass=cmd_class,
     install_requires=install_requires,
     extras_require=extras_require,
     setup_requires=[