Merge branch '1.2_maintenance' into 1.3_maintenance

GafferHQ · Aug 9, 2023 · 526d18b · 526d18b
2 parents 2a2f27e + 6da2114
commit 526d18b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/Changes.md b/Changes.md
@@ -256,7 +256,11 @@ Build
 - USD : Updated to version 23.05.
 - ZLib : Added version 1.2.13.
 
-1.2.10.x (relative to 1.2.10.0)
+1.2.10.x (relative to 1.2.10.1)
+========
+
+
+1.2.10.1 (relative to 1.2.10.0)
 ========
 
 Fixes

diff --git a/SConstruct b/SConstruct
@@ -45,10 +45,11 @@ import platform
 import shutil
 import subprocess
 import distutils.dir_util
+import codecs
 
 EnsureSConsVersion( 3, 0, 2 ) # Substfile is a default builder as of 3.0.2
 
-if locale.getpreferredencoding() != "UTF-8" :
+if codecs.lookup( locale.getpreferredencoding() ).name != "utf-8" :
 	# The `Substfile` builder uses `open()` without specifying an encoding, and
 	# so gets Python's default encoding. Unless this is `UTF-8`, any `.py` files
 	# containing unicode characters will be corrupted during installation.