lib: improved if statments for Unicode string support for Windows

Better checking for python version (fix bug
with python 4.0.0 which could break
unicode strings support)

Added checking for OS (unicode support doesn't
necessary for other systems)

Author: owl-from-hogvarts

gyp/pylib/gyp/easy_xml.py

@@ -122,10 +122,14 @@ def WriteXmlIfChanged(content, path, encoding="utf-8", pretty=False, win32=False
 
     default_encoding = locale.getdefaultlocale()[1]
     if default_encoding and default_encoding.upper() != encoding.upper():
-        if (sys.version_info[0] >= 3) and (sys.version_info[1] >= 7):
-            xml_string = xml_string.encode(encoding)
+        if sys.platform == "win32":
+            if (sys.version_info[0] + sys.version_info[1] * 0.1) > 3.7:
+                xml_string = xml_string.encode(encoding)
+            else:
+                xml_string = xml_string.decode("cp1251").encode(encoding)
+        # for non windows systems
         else:
-            xml_string = xml_string.decode("cp1251").encode(encoding)
+            xml_string = xml_string.encode(encoding)
 
     # Get the old content
     try:

gyp/pylib/gyp/input.py

@@ -236,9 +236,10 @@ def LoadOneBuildFile(build_file_path, data, aux_data, includes, is_target, check
             # But since node-gyp produces ebcdic files, do not use that mode.
             build_file_contents = open(build_file_path, "r").read()
         else:
-            if (sys.version_info[0] >= 3) and (sys.version_info[1] >= 7):
-                build_file_contents = open(build_file_path, 'rU', encoding="utf8").read()
+            if sys.version_info > (3, 7) and sys.platform == "win32":
+                build_file_contents = open(build_file_path, 'r', newline=None , encoding="utf8").read()
             else:
+                # "U" flag is used becouse of backward compatibility
                 build_file_contents = open(build_file_path, 'rU').read()
     else:
         raise GypError("%s not found (cwd: %s)" % (build_file_path, os.getcwd()))

lib/find-python-script.py

@@ -1,13 +1,11 @@
 import sys, codecs;
 
-if (sys.stdout.encoding != "utf-8"):
-    if (sys.version_info[0] >= 3) and (sys.version_info[1] >= 7):
+if (sys.stdout.encoding != "utf-8" and sys.platform == "win32"):
+    if sys.version_info > (3, 7):
         sys.stdout.reconfigure(encoding='utf-8')
+        print(sys.executable)
     else:
         sys.stdout = codecs.getwriter("utf8")(sys.stdout)
-
-
-if (sys.version_info[0] >= 3) and (sys.version_info[1] >= 7):
-    print(sys.executable)
+        print(sys.executable.decode("cp1251"))
 else:
-    print(sys.executable.decode("cp1251"));
+    print(sys.executable)