Remove the recently-added get_distutil_options(), and just

   have two tuples listing the legal keywords for setup() and Extension()

diff --git a/Lib/distutils/core.py b/Lib/distutils/core.py
index 9ab419ef4c1626d469755f65f1441a4b0201aa7a..29fbc5cdf95c6676c22aba4e4f99f596a281a7f7 100644 (file)
--- a/Lib/distutils/core.py
+++ b/Lib/distutils/core.py
@@ -42,6 +42,19 @@ def gen_usage (script_name):
 _setup_stop_after = None
 _setup_distribution = None
 
+# Legal keyword arguments for the setup() function
+setup_keywords = ('distclass', 'script_name', 'script_args', 'options',
+                  'name', 'version', 'author', 'author_email',
+                  'maintainer', 'maintainer_email', 'url', 'license',
+                  'description', 'long_description', 'keywords',
+                  'platforms', 'classifiers')
+
+# Legal keyword arguments for the Extension constructor
+extension_keywords = ('name', 'sources', 'include_dirs',
+                      'define_macros', 'undef_macros',
+                      'library_dirs', 'libraries', 'runtime_library_dirs',
+                      'extra_objects', 'extra_compile_args', 'extra_link_args',
+                      'export_symbols', 'depends', 'language')
 
 def setup (**attrs):
     """The gateway to the Distutils: do everything your setup script needs
@@ -226,11 +239,3 @@ def run_setup (script_name, script_args=None, stop_after="run"):
 
 # run_setup ()
 
-def get_distutil_options ():
-    """Returns a list of strings recording changes to the Distutils.
-
-    setup.py files can then do:
-      if 'optional-thing' in get_distutil_options():
-          ...
-    """
-    return []

diff --git a/Lib/distutils/extension.py b/Lib/distutils/extension.py
index 94b56e6ce4908863ce0f0d27aa93bc02b9bf2ead..e69f3e93e0157f14b810ddecfc37ab478812147b 100644 (file)
--- a/Lib/distutils/extension.py
+++ b/Lib/distutils/extension.py
@@ -82,6 +82,8 @@ class Extension:
         from the source extensions if not provided.
     """
 
+    # When adding arguments to this constructor, be sure to update
+    # setup_keywords in core.py.
     def __init__ (self, name, sources,
                   include_dirs=None,
                   define_macros=None,