Grammar fixes by Brett Cannon.

This commit is contained in:
Eric V. Smith 2012-04-19 18:10:05 -04:00
parent bfcd81b80e
commit 97b3e45cff
1 changed files with 7 additions and 7 deletions

View File

@ -24,15 +24,15 @@ and 402.
Terminology
===========
Within this PEP, the term package refers to Python packages as defined
by Python's import statement. The term distribution refers to
Within this PEP, the term "package" refers to Python packages as defined
by Python's import statement. The term "distribution" refers to
separately installable sets of Python modules as stored in the Python
package index, and installed by distutils or setuptools. The term
vendor package refers to groups of files installed by an operating
"vendor package" refers to groups of files installed by an operating
system's packaging mechanism (e.g. Debian or Redhat packages install
on Linux systems).
The term portion refers to a set of files in a single directory (possibly
The term "portion" refers to a set of files in a single directory (possibly
stored in a zip file) that contribute to a namespace package.
The term "regular package" refers to packages as they are implemented
@ -58,8 +58,8 @@ fragments on sys.path which portion is imported first. As a special
feature, extend_path reads files named ``<packagename>.pkg`` which
allow to declare additional portions.
setuptools provides a similar function pkg_resources.declare_namespace
that is used in the form::
setuptools provides a similar function named
pkg_resources.declare_namespace that is used in the form::
import pkg_resources
pkg_resources.declare_namespace(__name__)
@ -93,7 +93,7 @@ sys.path entry).
The current imperative approach causes problems for system vendors.
Vendor packages typically must not provide overlapping files, and an
attempt to install a vendor package that has a file already on disk
will fail or cause unpredictable behavior. As vendors might chose to
will fail or cause unpredictable behavior. As vendors might choose to
package distributions such that they will end up all in a single
directory for the namespace package, all portions would contribute
conflicting __init__.py files.