Merged revisions 74533 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r74533 | tarek.ziade | 2009-08-21 16:11:26 +0200 (Fri, 21 Aug 2009) | 1 line

  Fixed #6556: Corrected doc on how Distutils looks for its user configuration file under Windows
........

diff --git a/Doc/install/index.rst b/Doc/install/index.rst
index b1b94686cdfbda5d3c1c9ae9c73ad7c041050c85..c67ccee6f47b18872429ca2cb5482e90db45d716 100644 (file)
--- a/Doc/install/index.rst
+++ b/Doc/install/index.rst
@@ -706,7 +706,8 @@ Notes:
 (2)
    On Unix, if the :envvar:`HOME` environment variable is not defined, the user's
    home directory will be determined with the :func:`getpwuid` function from the
-   standard :mod:`pwd` module.
+   standard :mod:`pwd` module. This is done by the :func:`os.path.expanduser`
+   function used by Distutils.
 
 (3)
    I.e., in the current directory (usually the location of the setup script).
@@ -721,9 +722,10 @@ Notes:
    1.5.2 installation under Windows.
 
 (5)
-   On Windows, if the :envvar:`HOME` environment variable is not defined, no
-   personal configuration file will be found or used.  (In other words, the
-   Distutils make no attempt to guess your home directory on Windows.)
+   On Windows, if the :envvar:`HOME` environment variable is not defined,
+   :envvar:`USERPROFILE` then :envvar:`HOMEDRIVE` and :envvar:`HOMEPATH` will
+   be tried. This is done by the :func:`os.path.expanduser` function used
+   by Distutils.
 
 
 .. _inst-config-syntax:

diff --git a/Misc/NEWS b/Misc/NEWS
index 4b8bb707098ce83505463bc5ca36b64935ea1d48..94e043ea45c5464ef425246ab77db9c18d19c00d 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -1237,6 +1237,9 @@ Build
 Documentation
 -------------
 
+- Issue #6556: Fixed the Distutils configuration files location explanation
+  for Windows.
+
 - Issue #2235: the C API function PyObject_HashNotImplemented and its
   interaction with the tp_hash slot (added in 2.6b2) are now documented