Small update

GameMaker2k · Oct 12, 2024 · 1050a46 · 1050a46
1 parent 78b8cb0
commit 1050a46
Showing 1 changed file with 96 additions and 8 deletions.
diff --git a/libhockeydata/hockeyfunctions.py b/libhockeydata/hockeyfunctions.py
@@ -2113,8 +2113,30 @@ def MakeHockeyPythonFromHockeyArray(inhockeyarray, verbose=True, jsonverbose=Tru
     pyfilename = __package__
     if (pyfilename == "__main__"):
         pyfilename = os.path.splitext(os.path.basename(__file__))[0]
-    pystring = "#!/usr/bin/env python\n# -*- coding: utf-8 -*-\n\nfrom __future__ import absolute_import, division, print_function, unicode_literals;\nimport "+pyfilename + \
-        ";\ntry:\n reload(sys);\nexcept NameError:\n from importlib import reload;\n reload(sys);\ntry:\n sys.setdefaultencoding('UTF-8');\nexcept AttributeError:\n pass;\n\n"
+    pystring = """#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+from __future__ import absolute_import, division, print_function, unicode_literals
+import {pyfilename}, sys
+
+# Python 2 handling: Reload sys and set UTF-8 encoding if applicable
+try:
+    reload(sys)  # Only relevant for Python 2
+    if hasattr(sys, "setdefaultencoding"):
+        sys.setdefaultencoding('UTF-8')
+except (NameError, AttributeError):
+    pass
+
+# Python 3 handling: Ensure stdout and stderr use UTF-8 encoding
+if hasattr(sys.stdout, "detach"):
+    import io
+    sys.stdout = io.TextIOWrapper(
+        sys.stdout.detach(), encoding='UTF-8', errors='replace')
+if hasattr(sys.stderr, "detach"):
+    import io
+    sys.stderr = io.TextIOWrapper(
+        sys.stderr.detach(), encoding='UTF-8', errors='replace')
+""".format(pyfilename=pyfilename)
     pystring = pystring+"sqldatacon = "+pyfilename + \
         ".MakeHockeyDatabase(\""+inchockeyarray['database']+"\");\n"
     pystring = pystring+pyfilename+".MakeHockeyLeagueTable(sqldatacon);\n"
@@ -2206,8 +2228,30 @@ def MakeHockeyPythonAltFromHockeyArray(inhockeyarray, verbose=True, jsonverbose=
     pyfilename = __package__
     if (pyfilename == "__main__"):
         pyfilename = os.path.splitext(os.path.basename(__file__))[0]
-    pystring = "#!/usr/bin/env python\n# -*- coding: utf-8 -*-\n\nfrom __future__ import absolute_import, division, print_function, unicode_literals;\nimport "+pyfilename + \
-        ";\ntry:\n reload(sys);\nexcept NameError:\n from importlib import reload;\n reload(sys);\ntry:\n sys.setdefaultencoding('UTF-8');\nexcept AttributeError:\n pass;\n\n"
+    pystring = """#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+from __future__ import absolute_import, division, print_function, unicode_literals
+import {pyfilename}, sys
+
+# Python 2 handling: Reload sys and set UTF-8 encoding if applicable
+try:
+    reload(sys)  # Only relevant for Python 2
+    if hasattr(sys, "setdefaultencoding"):
+        sys.setdefaultencoding('UTF-8')
+except (NameError, AttributeError):
+    pass
+
+# Python 3 handling: Ensure stdout and stderr use UTF-8 encoding
+if hasattr(sys.stdout, "detach"):
+    import io
+    sys.stdout = io.TextIOWrapper(
+        sys.stdout.detach(), encoding='UTF-8', errors='replace')
+if hasattr(sys.stderr, "detach"):
+    import io
+    sys.stderr = io.TextIOWrapper(
+        sys.stderr.detach(), encoding='UTF-8', errors='replace')
+""".format(pyfilename=pyfilename)
     pystring = pystring+"hockeyarray = "+pyfilename + \
         ".CreateHockeyArray(\""+inchockeyarray['database']+"\");\n"
     for hlkey in inchockeyarray['leaguelist']:
@@ -2309,8 +2353,30 @@ def MakeHockeyPythonOOPFromHockeyArray(inhockeyarray, verbose=True, jsonverbose=
     pyfilename = __package__
     if (pyfilename == "__main__"):
         pyfilename = os.path.splitext(os.path.basename(__file__))[0]
-    pystring = "#!/usr/bin/env python\n# -*- coding: utf-8 -*-\n\nfrom __future__ import absolute_import, division, print_function, unicode_literals;\nimport "+pyfilename + \
-        ";\ntry:\n reload(sys);\nexcept NameError:\n from importlib import reload;\n reload(sys);\ntry:\n sys.setdefaultencoding('UTF-8');\nexcept AttributeError:\n pass;\n\n"
+    pystring = """#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+from __future__ import absolute_import, division, print_function, unicode_literals
+import {pyfilename}, sys
+
+# Python 2 handling: Reload sys and set UTF-8 encoding if applicable
+try:
+    reload(sys)  # Only relevant for Python 2
+    if hasattr(sys, "setdefaultencoding"):
+        sys.setdefaultencoding('UTF-8')
+except (NameError, AttributeError):
+    pass
+
+# Python 3 handling: Ensure stdout and stderr use UTF-8 encoding
+if hasattr(sys.stdout, "detach"):
+    import io
+    sys.stdout = io.TextIOWrapper(
+        sys.stdout.detach(), encoding='UTF-8', errors='replace')
+if hasattr(sys.stderr, "detach"):
+    import io
+    sys.stderr = io.TextIOWrapper(
+        sys.stderr.detach(), encoding='UTF-8', errors='replace')
+""".format(pyfilename=pyfilename)
     pystring = pystring+"sqldatacon = "+pyfilename + \
         ".MakeHockeyClass(\""+inchockeyarray['database']+"\");\n"
     pystring = pystring+"sqldatacon.MakeHockeyLeagueTable(sqldatacon);\n"
@@ -2408,8 +2474,30 @@ def MakeHockeyPythonOOPAltFromHockeyArray(inhockeyarray, verbose=True, jsonverbo
     pyfilename = __package__
     if (pyfilename == "__main__"):
         pyfilename = os.path.splitext(os.path.basename(__file__))[0]
-    pystring = "#!/usr/bin/env python\n# -*- coding: utf-8 -*-\n\nfrom __future__ import absolute_import, division, print_function, unicode_literals;\nimport "+pyfilename + \
-        ";\ntry:\n reload(sys);\nexcept NameError:\n from importlib import reload;\n reload(sys);\ntry:\n sys.setdefaultencoding('UTF-8');\nexcept AttributeError:\n pass;\n\n"
+    pystring = """#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+from __future__ import absolute_import, division, print_function, unicode_literals
+import {pyfilename}, sys
+
+# Python 2 handling: Reload sys and set UTF-8 encoding if applicable
+try:
+    reload(sys)  # Only relevant for Python 2
+    if hasattr(sys, "setdefaultencoding"):
+        sys.setdefaultencoding('UTF-8')
+except (NameError, AttributeError):
+    pass
+
+# Python 3 handling: Ensure stdout and stderr use UTF-8 encoding
+if hasattr(sys.stdout, "detach"):
+    import io
+    sys.stdout = io.TextIOWrapper(
+        sys.stdout.detach(), encoding='UTF-8', errors='replace')
+if hasattr(sys.stderr, "detach"):
+    import io
+    sys.stderr = io.TextIOWrapper(
+        sys.stderr.detach(), encoding='UTF-8', errors='replace')
+""".format(pyfilename=pyfilename)
     pystring = pystring+"hockeyarray = "+pyfilename + \
         ".MakeHockeyArray(\""+inchockeyarray['database']+"\");\n"
     for hlkey in inchockeyarray['leaguelist']: