[Python-checkins] cpython (merge default -> default): Branch merge
eric.araujo
python-checkins at python.org
Wed Aug 31 15:35:03 CEST 2011
http://hg.python.org/cpython/rev/b8950bffa952
changeset: 72149:b8950bffa952
parent: 72145:3102951cc1ce
parent: 72148:a49c38950b1f
user: Éric Araujo <merwok at netwok.org>
date: Wed Aug 31 15:34:34 2011 +0200
summary:
Branch merge
files:
Lib/packaging/_trove.py | 7 +
Lib/packaging/command/build_ext.py | 2 +-
Lib/packaging/run.py | 222 +++++++---------
3 files changed, 109 insertions(+), 122 deletions(-)
diff --git a/Lib/packaging/_trove.py b/Lib/packaging/_trove.py
--- a/Lib/packaging/_trove.py
+++ b/Lib/packaging/_trove.py
@@ -38,7 +38,10 @@
'Environment :: X11 Applications :: Qt',
'Framework :: BFG',
'Framework :: Buildout',
+'Framework :: Buildout :: Extension',
+'Framework :: Buildout :: Recipe',
'Framework :: Chandler',
+'Framework :: CherryPy',
'Framework :: CubicWeb',
'Framework :: Django',
'Framework :: IDLE',
@@ -47,6 +50,7 @@
'Framework :: Pylons',
'Framework :: Setuptools Plugin',
'Framework :: Trac',
+'Framework :: Tryton',
'Framework :: TurboGears',
'Framework :: TurboGears :: Applications',
'Framework :: TurboGears :: Widgets',
@@ -69,6 +73,7 @@
'Intended Audience :: System Administrators',
'Intended Audience :: Telecommunications Industry',
'License :: Aladdin Free Public License (AFPL)',
+'License :: CC0 1.0 Universal (CC0 1.0) Public Domain Dedication',
'License :: DFSG approved',
'License :: Eiffel Forum License (EFL)',
'License :: Free For Educational Use',
@@ -376,6 +381,7 @@
'Topic :: Internet :: WWW/HTTP :: Dynamic Content :: Page Counters',
'Topic :: Internet :: WWW/HTTP :: HTTP Servers',
'Topic :: Internet :: WWW/HTTP :: Indexing/Search',
+'Topic :: Internet :: WWW/HTTP :: Session',
'Topic :: Internet :: WWW/HTTP :: Site Management',
'Topic :: Internet :: WWW/HTTP :: Site Management :: Link Checking',
'Topic :: Internet :: WWW/HTTP :: WSGI',
@@ -431,6 +437,7 @@
'Topic :: Printing',
'Topic :: Religion',
'Topic :: Scientific/Engineering',
+'Topic :: Scientific/Engineering :: Artificial Life',
'Topic :: Scientific/Engineering :: Artificial Intelligence',
'Topic :: Scientific/Engineering :: Astronomy',
'Topic :: Scientific/Engineering :: Atmospheric Science',
diff --git a/Lib/packaging/command/build_ext.py b/Lib/packaging/command/build_ext.py
--- a/Lib/packaging/command/build_ext.py
+++ b/Lib/packaging/command/build_ext.py
@@ -650,7 +650,7 @@
else:
if sysconfig.get_config_var('Py_ENABLE_SHARED'):
- template = 'python%d%d' + sys.abiflags
+ template = 'python%d.%d' + sys.abiflags
pythonlib = template % sys.version_info[:2]
return ext.libraries + [pythonlib]
else:
diff --git a/Lib/packaging/run.py b/Lib/packaging/run.py
--- a/Lib/packaging/run.py
+++ b/Lib/packaging/run.py
@@ -30,118 +30,6 @@
pysetup action --help
"""
-create_usage = """\
-Usage: pysetup create
- or: pysetup create --help
-
-Create a new Python project.
-"""
-
-generate_usage = """\
-Usage: pysetup generate-setup
- or: pysetup generate-setup --help
-
-Generate a setup.py script for backward-compatibility purposes.
-"""
-
-
-graph_usage = """\
-Usage: pysetup graph dist
- or: pysetup graph --help
-
-Print dependency graph for the distribution.
-
-positional arguments:
- dist installed distribution name
-"""
-
-install_usage = """\
-Usage: pysetup install [dist]
- or: pysetup install [archive]
- or: pysetup install [src_dir]
- or: pysetup install --help
-
-Install a Python distribution from the indexes, source directory, or sdist.
-
-positional arguments:
- archive path to source distribution (zip, tar.gz)
- dist distribution name to install from the indexes
- scr_dir path to source directory
-
-"""
-
-metadata_usage = """\
-Usage: pysetup metadata [dist]
- or: pysetup metadata [dist] [-f field ...]
- or: pysetup metadata --help
-
-Print metadata for the distribution.
-
-positional arguments:
- dist installed distribution name
-
-optional arguments:
- -f metadata field to print; omit to get all fields
-"""
-
-remove_usage = """\
-Usage: pysetup remove dist [-y]
- or: pysetup remove --help
-
-Uninstall a Python distribution.
-
-positional arguments:
- dist installed distribution name
-
-optional arguments:
- -y auto confirm distribution removal
-"""
-
-run_usage = """\
-Usage: pysetup run [global_opts] cmd1 [cmd1_opts] [cmd2 [cmd2_opts] ...]
- or: pysetup run --help
- or: pysetup run --list-commands
- or: pysetup run cmd --help
-"""
-
-list_usage = """\
-Usage: pysetup list dist [dist ...]
- or: pysetup list --help
- or: pysetup list --all
-
-Print name, version and location for the matching installed distributions.
-
-positional arguments:
- dist installed distribution name
-
-optional arguments:
- --all list all installed distributions
-"""
-
-search_usage = """\
-Usage: pysetup search [project] [--simple [url]] [--xmlrpc [url] [--fieldname value ...] --operator or|and]
- or: pysetup search --help
-
-Search the indexes for the matching projects.
-
-positional arguments:
- project the project pattern to search for
-
-optional arguments:
- --xmlrpc [url] wether to use the xmlrpc index or not. If an url is
- specified, it will be used rather than the default one.
-
- --simple [url] wether to use the simple index or not. If an url is
- specified, it will be used rather than the default one.
-
- --fieldname value Make a search on this field. Can only be used if
- --xmlrpc has been selected or is the default index.
-
- --operator or|and Defines what is the operator to use when doing xmlrpc
- searchs with multiple fieldnames. Can only be used if
- --xmlrpc has been selected or is the default index.
-"""
-
global_options = [
# The fourth entry for verbose means that it can be repeated.
('verbose', 'v', "run verbosely (default)", True),
@@ -204,19 +92,37 @@
return wrapper
- at action_help(create_usage)
+ at action_help("""\
+Usage: pysetup create
+ or: pysetup create --help
+
+Create a new Python project.
+""")
def _create(distpatcher, args, **kw):
from packaging.create import main
return main()
- at action_help(generate_usage)
+ at action_help("""\
+Usage: pysetup generate-setup
+ or: pysetup generate-setup --help
+
+Generate a setup.py script for backward-compatibility purposes.
+""")
def _generate(distpatcher, args, **kw):
generate_setup_py()
logger.info('The setup.py was generated')
- at action_help(graph_usage)
+ at action_help("""\
+Usage: pysetup graph dist
+ or: pysetup graph --help
+
+Print dependency graph for the distribution.
+
+positional arguments:
+ dist installed distribution name
+""")
def _graph(dispatcher, args, **kw):
name = args[1]
dist = get_distribution(name, use_egg_info=True)
@@ -229,7 +135,19 @@
print(graph.repr_node(dist))
- at action_help(install_usage)
+ at action_help("""\
+Usage: pysetup install [dist]
+ or: pysetup install [archive]
+ or: pysetup install [src_dir]
+ or: pysetup install --help
+
+Install a Python distribution from the indexes, source directory, or sdist.
+
+positional arguments:
+ archive path to source distribution (zip, tar.gz)
+ dist distribution name to install from the indexes
+ scr_dir path to source directory
+""")
def _install(dispatcher, args, **kw):
# first check if we are in a source directory
if len(args) < 2:
@@ -249,7 +167,19 @@
return not install(target)
- at action_help(metadata_usage)
+ at action_help("""\
+Usage: pysetup metadata [dist]
+ or: pysetup metadata [dist] [-f field ...]
+ or: pysetup metadata --help
+
+Print metadata for the distribution.
+
+positional arguments:
+ dist installed distribution name
+
+optional arguments:
+ -f metadata field to print; omit to get all fields
+""")
def _metadata(dispatcher, args, **kw):
opts = _parse_args(args[1:], 'f:', [])
if opts['args']:
@@ -284,7 +214,18 @@
print(' ', value.replace('\n', '\n '))
- at action_help(remove_usage)
+ at action_help("""\
+Usage: pysetup remove dist [-y]
+ or: pysetup remove --help
+
+Uninstall a Python distribution.
+
+positional arguments:
+ dist installed distribution name
+
+optional arguments:
+ -y auto confirm distribution removal
+""")
def _remove(distpatcher, args, **kw):
opts = _parse_args(args[1:], 'y', [])
if 'y' in opts:
@@ -303,7 +244,12 @@
return retcode
- at action_help(run_usage)
+ at action_help("""\
+Usage: pysetup run [global_opts] cmd1 [cmd1_opts] [cmd2 [cmd2_opts] ...]
+ or: pysetup run --help
+ or: pysetup run --list-commands
+ or: pysetup run cmd --help
+""")
def _run(dispatcher, args, **kw):
parser = dispatcher.parser
args = args[1:]
@@ -343,7 +289,19 @@
return dist
- at action_help(list_usage)
+ at action_help("""\
+Usage: pysetup list dist [dist ...]
+ or: pysetup list --help
+ or: pysetup list --all
+
+Print name, version and location for the matching installed distributions.
+
+positional arguments:
+ dist installed distribution name
+
+optional arguments:
+ --all list all installed distributions
+""")
def _list(dispatcher, args, **kw):
opts = _parse_args(args[1:], '', ['all'])
dists = get_distributions(use_egg_info=True)
@@ -369,7 +327,29 @@
logger.info('Found %d projects installed.', number)
- at action_help(search_usage)
+ at action_help("""\
+Usage: pysetup search [project] [--simple [url]] [--xmlrpc [url] [--fieldname value ...] --operator or|and]
+ or: pysetup search --help
+
+Search the indexes for the matching projects.
+
+positional arguments:
+ project the project pattern to search for
+
+optional arguments:
+ --xmlrpc [url] whether to use the xmlrpc index or not. If an url is
+ specified, it will be used rather than the default one.
+
+ --simple [url] whether to use the simple index or not. If an url is
+ specified, it will be used rather than the default one.
+
+ --fieldname value Make a search on this field. Can only be used if
+ --xmlrpc has been selected or is the default index.
+
+ --operator or|and Defines what is the operator to use when doing xmlrpc
+ searchs with multiple fieldnames. Can only be used if
+ --xmlrpc has been selected or is the default index.
+""")
def _search(dispatcher, args, **kw):
"""The search action.
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list