Minor fixes of typos and grammar in the first third of the file.

This commit is contained in:
Guido van Rossum 2009-06-30 22:10:55 +00:00
parent 47504f6cf1
commit 667184c290
1 changed files with 16 additions and 15 deletions

View File

@ -60,12 +60,12 @@ Python:
How distributions are installed
-------------------------------
Right now, when a distribution is installed in Python, every element it
contains is installed in various directories.
Right now, when a distribution is installed in Python, the elements it
contains are installed in various directories.
The pure Python code, for instance, is installed in the `purelib` directory
which is located in the Python installation at ``lib\python2.6\site-packages``
for example under Unix-like systems or Mac OS X, and in ``Lib/site-packages``
which is located in the Python installation at ``lib/python2.6/site-packages``
for example under Unix-like systems or Mac OS X, and in ``Lib\site-packages``
under Windows. This is done with the Distutils `install` command, which calls
various subcommands.
@ -174,12 +174,13 @@ The syntax of the egg-info directory name is as follows::
The egg-info directory name is created using a new function called
``egginfo_dirname(name, version)`` added to ``pkgutil``. ``name`` is
converted to a standard distribution name any runs of non-alphanumeric
characters are replaced with a single '-'. ``version`` is converted
converted to a standard distribution name by replacing any runs of
non-alphanumeric characters with a single '-'. ``version`` is converted
to a standard version string. Spaces become dots, and all other
non-alphanumeric characters become dashes, with runs of multiple dashes
condensed to a single dash. Both attributes are then converted into their
filename-escaped form. Any '-' characters are currently replaced with '_'.
non-alphanumeric characters (except dots) become dashes, with runs of
multiple dashes condensed to a single dash. Both attributes are then
converted into their filename-escaped form, i.e. any '-' characters are
replaced with '_'.
Examples::
@ -198,10 +199,10 @@ Adding a RECORD file in the .egg-info directory
A `RECORD` file will be added inside the `.egg-info` directory at installation
time. The `RECORD` file will hold the list of installed files. These correspond
to the files listed by the `record` option of the `install` command, and will
be generated by default. This will allow uninstallation, as explained later in this
PEP. The `install` command will also provide an option to prevent the `RECORD`
file from being written and this option should be used when creating system
packages.
be generated by default. This will allow uninstallation, as explained later in
this PEP. The `install` command will also provide an option to prevent the
`RECORD` file from being written and this option should be used when creating
system packages.
Third-party installation tools also should not overwrite or delete files
that are not in a RECORD file without prompting or warning.
@ -217,7 +218,7 @@ the `excel` dialect, which uses these options to read the file:
- field delimiter : `,`
- quoting char : `"`.
- line terminator : ``os.linesep`` (so ``\r\n`` or ``\r``)
- line terminator : ``os.linesep`` (so ``\r\n`` or ``\n``)
Each record is composed of three elements.
@ -226,7 +227,7 @@ Each record is composed of three elements.
- if the installed file is located in the directory where the `.egg-info`
directory of the package is located, it will be a '/'-separated relative
path, no matter what the target system is. This makes this information
cross-compatible and allows simple installation to be relocatable.
cross-compatible and allows simple installations to be relocatable.
- if the installed file is located elsewhere in the system, a
'/'-separated absolute path is used.