From 9fdb925c36d8c3d2787bd35d097b378ddaebcb11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= Date: Tue, 19 Jun 2012 17:13:49 +0200 Subject: [PATCH] Incorporate Terry's and Brian's feedback. --- pep-0397.txt | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pep-0397.txt b/pep-0397.txt index c927ce515..0aff66aae 100644 --- a/pep-0397.txt +++ b/pep-0397.txt @@ -96,8 +96,8 @@ Installation with a reference counter. It contains a version resource matching the version number of the pythonXY.dll with which it is distributed. Independent - installations will always only overwrite newer versions of the - launcher with older versions. Stand-alone releases use + installations will overwrite older version + of the launcher with newer versions. Stand-alone releases use a release level of 0x10 in FIELD3 of the CPython release on which they are based. @@ -211,7 +211,9 @@ Configuration file Two .ini files will be searched by the launcher - ``py.ini`` in the current user's "application data" directory (i.e. the directory returned - by calling the Windows function SHGetFolderPath with CSIDL_LOCAL_APPDATA) + by calling the Windows function SHGetFolderPath with CSIDL_LOCAL_APPDATA, + %USERPROFILE%\AppData\Local on Vista+, + %USERPROFILE%\Local Settings\Application Data on XP) and ``py.ini`` in the same directory as the launcher. The same .ini files are used for both the 'console' version of the launcher (i.e. py.exe) and for the 'windows' version (i.e. pyw.exe)