[Python-checkins] python/dist/src/Lib/distutils core.py,1.56,1.57 extension.py,1.17,1.18

2003年1月27日 08:30:39 -0800

Update of /cvsroot/python/python/dist/src/Lib/distutils
In directory sc8-pr-cvs1:/tmp/cvs-serv28128
Modified Files:
	core.py extension.py 
Log Message:
Remove the recently-added get_distutil_options(), and just 
 have two tuples listing the legal keywords for setup() and Extension()
Index: core.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/distutils/core.py,v
retrieving revision 1.56
retrieving revision 1.57
diff -C2 -d -r1.56 -r1.57
*** core.py	19 Nov 2002 13:12:27 -0000	1.56
--- core.py	27 Jan 2003 16:30:35 -0000	1.57
***************
*** 43,46 ****
--- 43,59 ----
 _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):
***************
*** 227,236 ****
 # 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 []
--- 240,241 ----
Index: extension.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/distutils/extension.py,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** extension.py	27 Nov 2002 13:45:26 -0000	1.17
--- extension.py	27 Jan 2003 16:30:36 -0000	1.18
***************
*** 83,86 ****
--- 83,88 ----
 """
 
+ # When adding arguments to this constructor, be sure to update
+ # setup_keywords in core.py.
 def __init__ (self, name, sources,
 include_dirs=None,