Merge branch 'fix_4746_TEMPFILE_ENC_ISSUE' into fix_4746_TEMPFILE_ENC_ISSUE

Author: bdbaddog

CHANGES.txt

@@ -87,6 +87,7 @@ RELEASE  VERSION/DATE TO BE FILLED IN LATER
       of decoding errors, TEMPFILEENCODING can now be specified to give
       more explicit instructions to SCons.
 
+
   From Edward Peek:
     - Fix the variant dir component being missing from generated source file
       paths with CompilationDatabase() builder (Fixes #4003).

RELEASE.txt

@@ -83,7 +83,6 @@ FIXES
   as the default path for temporary files includes the username. Setting
   (existing) TEMPFILEDIR may also help in this case.
 
-
 IMPROVEMENTS
 ------------
 

SCons/Platform/__init__.py

@@ -47,6 +47,7 @@
 import os
 import sys
 import tempfile
+import locale
 
 import SCons.Action
 import SCons.Errors