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 9ab419e..29fbc5c 100644
--- a/Lib/distutils/core.py
+++ b/Lib/distutils/core.py
@@ -42,6 +42,19 @@
_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 @@
# 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 94b56e6..e69f3e9 100644
--- a/Lib/distutils/extension.py
+++ b/Lib/distutils/extension.py
@@ -82,6 +82,8 @@
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,