Merge 3.2: sys.getfilesystemencoding() raises a RuntimeError if

initfsencoding() was not called yet: detect bootstrap (startup) issues earlier.

diff --cc Misc/NEWS
index fff54b8f7a0a4b7135900a9645e8f139e460b5d3,da09cc99b59fd93bc3ed3e0ed13e3475e80f8b22..e9f0a5908474622a0d3a50864989fbb59d5d3151
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -87,13 -49,11 +87,16 @@@ Core and Builtin
  Library
  -------
  
+ - sys.getfilesystemencoding() raises a RuntimeError if initfsencoding() was not
+   called yet: detect bootstrap (startup) issues earlier.
+ 
 +- Issue #11393: Add the new faulthandler module.
 +
  - Issue #11618: Fix the timeout logic in threading.Lock.acquire() under Windows.
  
 +- Removed the 'strict' argument to email.parser.Parser, which has been
 +  deprecated since Python 2.4.
 +
  - Issue #11256: Fix inspect.getcallargs on functions that take only keyword
    arguments.
  

diff --cc Python/sysmodule.c
Simple merge