[Python-checkins] cpython (merge 3.4 -> default): Merge with 3.4

[terry.reedy]

http://hg.python.org/cpython/rev/b82299695616
changeset:   90499:b82299695616
parent:      90496:3b203f000256
parent:      90498:3fef95842314
user:        Terry Jan Reedy <tjreedy at udel.edu>
date:        Tue Apr 29 00:32:17 2014 -0400
summary:
  Merge with 3.4

files:
  Doc/library/site.rst |  6 +++++-
  Misc/ACKS            |  1 +
  2 files changed, 6 insertions(+), 1 deletions(-)


diff --git a/Doc/library/site.rst b/Doc/library/site.rst
--- a/Doc/library/site.rst
+++ b/Doc/library/site.rst
@@ -99,7 +99,11 @@
 :mod:`sitecustomize`, which can perform arbitrary site-specific customizations.
 It is typically created by a system administrator in the site-packages
 directory.  If this import fails with an :exc:`ImportError` exception, it is
-silently ignored.
+silently ignored.  If Python is started without output streams available, as
+with :file:`pythonw.exe` on Windows (which is used by default to start IDLE),
+attempted output from :mod:`sitecustomize` is ignored. Any exception other
+than :exc:`ImportError` causes a silent and perhaps mysterious failure of the
+process.
 
 .. index:: module: usercustomize
 
diff --git a/Misc/ACKS b/Misc/ACKS
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -1427,6 +1427,7 @@
 Jason Williams
 John Williams
 Sue Williams
+Carol Willing
 Steven Willis
 Frank Willison
 Geoff Wilson

-- 
Repository URL: http://hg.python.org/cpython