[Python-checkins] r80513 - peps/trunk/pep-0376.txt

[tarek.ziade]

Author: tarek.ziade
Date: Mon Apr 26 23:36:54 2010
New Revision: 80513

Log:
minor fixes

Modified:
   peps/trunk/pep-0376.txt

Modified: peps/trunk/pep-0376.txt
==============================================================================
--- peps/trunk/pep-0376.txt	(original)
+++ peps/trunk/pep-0376.txt	Mon Apr 26 23:36:54 2010
@@ -486,15 +486,15 @@
 is running the `install` command over the `setup.py` script of the
 distribution.
 
-Distutils will provide a very basic ``uninstall`` function, that is added
-in ``distutils.util`` and takes the name of the distribution to uninstall
-as its argument. ``uninstall`` uses the APIs described earlier and remove all
-unique files, as long as their hash didn't change. Then it removes empty
-directories left behind.
+Distutils2 [#pep262]_ will provide a very basic ``uninstall`` function, that
+is added in ``distutils2.util`` and takes the name of the distribution to
+uninstall as its argument. ``uninstall`` uses the APIs described earlier and
+remove all unique files, as long as their hash didn't change. Then it removes
+empty directories left behind.
 
 ``uninstall`` returns a list of uninstalled files::
 
-    >>> from distutils.util import uninstall
+    >>> from distutils2.util import uninstall
     >>> uninstall('docutils')
     ['/opt/local/lib/python2.6/site-packages/docutils/core.py',
      ...
@@ -535,7 +535,7 @@
 
 To avoid removing distributions that were installed by another packaging
 system, the ``uninstall`` function takes an extra argument ``installer`` which
-defaults to ``distutils``.
+defaults to ``distutils2``.
 
 When called, ``uninstall`` controls that the ``INSTALLER`` file matches
 this argument. If not, it raises a ``DistutilsUninstallError``::
@@ -556,9 +556,9 @@
 Adding an Uninstall script
 ~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-An `uninstall` script is added in Distutils. and is used like this::
+An `uninstall` script is added in Distutils2. and is used like this::
 
-    $ python -m distutils.uninstall projectname
+    $ python -m distutils2.uninstall projectname
 
 Notice that script doesn't control if the removal of a distribution breaks
 another distribution. Although it makes sure that all the files it removes
@@ -578,7 +578,7 @@
 - distutils2
 
 The plan is to include the functionality outlined in this PEP in pkgutil for
-Python 2.7 and Python 3.2, and in Distutils2.
+Python 3.2, and in Distutils2.
 
 Distutils2 will also contain a backport of the new pgkutil, and can be used for
 2.4 onward.
@@ -595,6 +595,9 @@
 .. [#distutils]
    http://docs.python.org/distutils
 
+.. [#distutils2]
+   http://hg.python.org/distutils2
+
 .. [#pep262]
    http://www.python.org/dev/peps/pep-0262