From: Meador Inge <meadori@gmail.com>
Date: Sun, 14 Apr 2013 01:51:04 +0000 (-0500)
Subject: Issue #16804: Fix 'python -S -m site' failure.
X-Git-Tag: v3.4.0a1~948^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2581bdb86a1db29091e5a67ef022415f65909f0f;p=thirdparty%2FPython%2Fcpython.git

Issue #16804: Fix 'python -S -m site' failure.

This commit fixes a bug in the 'site' module that was causing an exception
to incorrectly be thrown when running 'python -S -m site'.  The problem was
that 'USER_BASE' and 'USER_SITE' were being accessed before they were properly
initialized.  The code has been changed to use 'getuserbase' and
'getusersitepackages' instead so that the initialization always happens.
---

2581bdb86a1db29091e5a67ef022415f65909f0f
diff --cc Misc/NEWS
index c50b41a20794,3187ab0f4728..9284be34b723
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -46,11 -29,9 +46,14 @@@ Core and Builtin
  Library
  -------
  
+ - Issue #16804: Fix a bug in the 'site' module that caused running
+   'python -S -m site' to incorrectly throw an exception.
+ 
 +- Issue #15480: Remove the deprecated and unused TYPE_INT64 code from marshal.
 +  Initial patch by Daniel Riti.
 +
 +- Issue #2118: SMTPException is now a subclass of IOError.
 +
  - Issue #17016: Get rid of possible pointer wraparounds and integer overflows
    in the re module.  Patch by Nickolai Zeldovich.