r47145 - code changes

Author: hawkowl
Date: Mon Apr  4 00:46:13 2016
New Revision: 47145

Modified:
   branches/optional-deps-7995-2/setup.py
   branches/optional-deps-7995-2/setup3.py
   branches/optional-deps-7995-2/twisted/python/dist.py

Log:
code changes

Modified: branches/optional-deps-7995-2/setup.py
==============================================================================
--- branches/optional-deps-7995-2/setup.py	(original)
+++ branches/optional-deps-7995-2/setup.py	Mon Apr  4 00:46:13 2016
@@ -40,13 +40,13 @@
     setup_args = STATIC_PACKAGE_METADATA.copy()
 
     setup_args.update(dict(
-        packages=setuptools.find_packages(),
-        install_requires=requirements,
         conditionalExtensions=getExtensions(),
-        scripts=getScripts(),
+        extras_require=_EXTRAS_REQUIRE,
         include_package_data=True,
+        install_requires=requirements,
+        packages=setuptools.find_packages(),
+        scripts=getScripts(),
         zip_safe=False,
-        extras_require=_EXTRAS_REQUIRE,
     ))
 
     setup(**setup_args)

Modified: branches/optional-deps-7995-2/setup3.py
==============================================================================
--- branches/optional-deps-7995-2/setup3.py	(original)
+++ branches/optional-deps-7995-2/setup3.py	Mon Apr  4 00:46:13 2016
@@ -52,7 +52,8 @@
     if os.path.exists('twisted'):
         sys.path.insert(0, '.')
 
-    from twisted.python.dist import STATIC_PACKAGE_METADATA, getScripts
+    from twisted.python.dist import (STATIC_PACKAGE_METADATA, getScripts,
+                                     _EXTRAS_REQUIRE_PY3)
 
     args = STATIC_PACKAGE_METADATA.copy()
     args.update(dict(
@@ -60,11 +61,12 @@
             'build_py': PickyBuildPy,
             'build_scripts': PickyBuildScripts,
         },
-        packages=find_packages(),
-        install_requires=["zope.interface >= 4.0.2"],
-        zip_safe=False,
+        extras_require=_EXTRAS_REQUIRE_PY3,
         include_package_data=True,
+        install_requires=["zope.interface >= 4.0.2"],
+        packages=find_packages(),
         scripts=getScripts(),
+        zip_safe=False,
     ))
 
     setup(**args)

Modified: branches/optional-deps-7995-2/twisted/python/dist.py
==============================================================================
--- branches/optional-deps-7995-2/twisted/python/dist.py	(original)
+++ branches/optional-deps-7995-2/twisted/python/dist.py	Mon Apr  4 00:46:13 2016
@@ -105,6 +105,22 @@
     ),
 }
 
+_PLATFORM_INDEPENDENT_PY3 = (
+    _EXTRA_OPTIONS['tls'] +
+    _EXTRA_OPTIONS['conch'] +
+    _EXTRA_OPTIONS['serial']
+)
+
+_EXTRAS_REQUIRE_PY3 = {
+    'tls': _EXTRA_OPTIONS['tls'],
+    'conch': _EXTRA_OPTIONS['conch'],
+    'serial': _EXTRA_OPTIONS['serial'],
+    'all_non_platform': _PLATFORM_INDEPENDENT_PY3,
+    'windows_platform': (
+        _EXTRA_OPTIONS['windows'] + _PLATFORM_INDEPENDENT_PY3
+    ),
+}
+
 
 class ConditionalExtension(Extension):
     """