diff options
Diffstat (limited to 'Lib')
| -rw-r--r-- | Lib/packaging/create.py | 37 | ||||
| -rw-r--r-- | Lib/packaging/database.py | 2 | ||||
| -rw-r--r-- | Lib/packaging/metadata.py | 8 | ||||
| -rw-r--r-- | Lib/shutil.py | 2 |
4 files changed, 21 insertions, 28 deletions
diff --git a/Lib/packaging/create.py b/Lib/packaging/create.py index 917b6cf..8f39172 100644 --- a/Lib/packaging/create.py +++ b/Lib/packaging/create.py @@ -40,35 +40,36 @@ _DEFAULT_CFG = '.pypkgcreate' _helptext = { 'name': ''' -The name of the program to be packaged, usually a single word composed -of lower-case characters such as "python", "sqlalchemy", or "CherryPy". +The name of the project to be packaged, usually a single word composed +of lower-case characters such as "zope.interface", "sqlalchemy" or +"CherryPy". ''', 'version': ''' -Version number of the software, typically 2 or 3 numbers separated by dots -such as "1.00", "0.6", or "3.02.01". "0.1.0" is recommended for initial -development. +Version number of the software, typically 2 or 3 numbers separated by +dots such as "1.0", "0.6b3", or "3.2.1". "0.1.0" is recommended for +initial development. ''', 'summary': ''' -A one-line summary of what this project is or does, typically a sentence 80 -characters or less in length. +A one-line summary of what this project is or does, typically a sentence +80 characters or less in length. ''', 'author': ''' The full name of the author (typically you). ''', 'author_email': ''' -E-mail address of the project author (typically you). +Email address of the project author. ''', 'do_classifier': ''' Trove classifiers are optional identifiers that allow you to specify the intended audience by saying things like "Beta software with a text UI -for Linux under the PSF license". However, this can be a somewhat involved -process. +for Linux under the PSF license". However, this can be a somewhat +involved process. ''', 'packages': ''' -You can provide a package name contained in your project. +Python packages included in the project. ''', 'modules': ''' -You can provide a python module contained in your project. +Pure Python modules included in the project. ''', 'extra_files': ''' You can provide extra files/dirs contained in your project. @@ -76,15 +77,15 @@ It has to follow the template syntax. XXX add help here. ''', 'home_page': ''' -The home page for the project, typically starting with "http://". +The home page for the project, typically a public Web page. ''', 'trove_license': ''' -Optionally you can specify a license. Type a string that identifies a common -license, and then you can select a list of license specifiers. +Optionally you can specify a license. Type a string that identifies a +common license, and then you can select a list of license specifiers. ''', 'trove_generic': ''' Optionally, you can set other trove identifiers for things such as the -human language, programming language, user interface, etc... +human language, programming language, user interface, etc. ''', 'setup.py found': ''' The setup.py script will be executed to retrieve the metadata. @@ -468,12 +469,12 @@ class MainProgram: self.data['version'] = ask('Current version number', self.data.get('version'), _helptext['version']) - self.data['summary'] = ask('Package summary', + self.data['summary'] = ask('Project description summary', self.data.get('summary'), _helptext['summary'], lengthy=True) self.data['author'] = ask('Author name', self.data.get('author'), _helptext['author']) - self.data['author_email'] = ask('Author e-mail address', + self.data['author_email'] = ask('Author email address', self.data.get('author_email'), _helptext['author_email']) self.data['home_page'] = ask('Project home page', self.data.get('home_page'), _helptext['home_page'], diff --git a/Lib/packaging/database.py b/Lib/packaging/database.py index 0aaa0cd..c733b7a 100644 --- a/Lib/packaging/database.py +++ b/Lib/packaging/database.py @@ -191,7 +191,7 @@ class Distribution: A local absolute path is an absolute path in which occurrences of ``'/'`` have been replaced by the system separator given by ``os.sep``. - :parameter local: flag to say if the path should be returned a local + :parameter local: flag to say if the path should be returned as a local absolute path :type local: boolean diff --git a/Lib/packaging/metadata.py b/Lib/packaging/metadata.py index 53d91f7..104600b 100644 --- a/Lib/packaging/metadata.py +++ b/Lib/packaging/metadata.py @@ -182,14 +182,6 @@ _UNICODEFIELDS = ('Author', 'Maintainer', 'Summary', 'Description') _MISSING = object() -class NoDefault: - """Marker object used for clean representation""" - def __repr__(self): - return '<NoDefault>' - -_MISSING = NoDefault() - - class Metadata: """The metadata of a release. diff --git a/Lib/shutil.py b/Lib/shutil.py index 8718884..9ba602f1 100644 --- a/Lib/shutil.py +++ b/Lib/shutil.py @@ -399,7 +399,7 @@ def _make_tarball(base_name, base_dir, compress="gzip", verbose=0, dry_run=0, if not os.path.exists(archive_dir): if logger is not None: - logger.info("creating %s" % archive_dir) + logger.info("creating %s", archive_dir) if not dry_run: os.makedirs(archive_dir) |