Merge with 3.4

This commit is contained in:
Terry Jan Reedy 2014-04-29 00:32:17 -04:00
commit c763807d9b
2 changed files with 6 additions and 1 deletions

View File

@ -99,7 +99,11 @@ After these path manipulations, an attempt is made to import a module named
: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

View File

@ -1427,6 +1427,7 @@ Gerald S. Williams
Jason Williams
John Williams
Sue Williams
Carol Willing
Steven Willis
Frank Willison
Geoff Wilson