Merge branch 'unicodeFix' into develop

comicapi/comicinfoxml.py

@@ -51,12 +51,9 @@ class ComicInfoXml:
         return self.convertXMLToMetadata(tree)
 
     def stringFromMetadata(self, metadata, xml=None):
-
-        header = '<?xml version="1.0"?>\n'
-
         tree = self.convertMetadataToXML(self, metadata, xml)
-        tree_str = ET.tostring(tree.getroot()).decode()
-        return header + tree_str
+        tree_str = ET.tostring(tree.getroot(), encoding="utf-8", xml_declaration=True).decode()
+        return tree_str
 
     def indent(self, elem, level=0):
         # for making the XML output readable
@@ -90,7 +87,6 @@ class ComicInfoXml:
 
         def assign(cix_entry, md_entry):
             if md_entry is not None:
-                print(cix_entry, md_entry)
                 et_entry = root.find(cix_entry)
                 if et_entry is not None:
                     et_entry.text = "{0}".format(md_entry)
@@ -278,7 +274,7 @@ class ComicInfoXml:
 
         tree = self.convertMetadataToXML(self, metadata, xml)
         # ET.dump(tree)
-        tree.write(filename, encoding='utf-8')
+        tree.write(filename, encoding="utf-8", xml_declaration=True)
 
     def readFromExternalFile(self, filename):
 

comictagger.py

@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+import localefix
 from comictaggerlib.main import ctmain
 
 if __name__ == '__main__':

comictaggerlib/comicvinetalker.py

@@ -630,7 +630,6 @@ class ComicVineTalker(QObject):
                     for w in col_widths:
                         fmtstr += " {{:{}}}|".format(w + 1)
                     width = sum(col_widths) + len(col_widths) * 2
-                    print("width=", width)
                     table_text = ""
                     counter = 0
                     for row in rows:

localefix.py

@@ -0,0 +1,44 @@
+import locale
+import os
+import subprocess
+import sys
+
+def _lang_code_mac():
+     """
+     stolen from https://github.com/mu-editor/mu
+     Returns the user's language preference as defined in the Language & Region
+     preference pane in macOS's System Preferences.
+     """
+
+     # Uses the shell command `defaults read -g AppleLocale` that prints out a
+     # language code to standard output. Assumptions about the command:
+     # - It exists and is in the shell's PATH.
+     # - It accepts those arguments.
+     # - It returns a usable language code.
+     #
+     # Reference documentation:
+     # - The man page for the `defaults` command on macOS.
+     # - The macOS underlying API:
+     #   https://developer.apple.com/documentation/foundation/nsuserdefaults.
+
+     LANG_DETECT_COMMAND = 'defaults read -g AppleLocale'
+
+     status, output = subprocess.getstatusoutput(LANG_DETECT_COMMAND)
+     if status == 0:
+         # Command was successful.
+         lang_code = output
+     else:
+         _logger.warning('Language detection command failed: %r', output)
+         lang_code = ''
+
+     return lang_code
+
+if sys.platform == "darwin" and "LANG" not in os.environ:
+    code = _lang_code_mac()
+    if code != "":
+        os.environ["LANG"] = f"{code}.utf-8"
+
+locale.setlocale(locale.LC_ALL, '')
+sys.stdout.reconfigure(encoding=sys.getdefaultencoding())
+sys.stderr.reconfigure(encoding=sys.getdefaultencoding())
+sys.stdin.reconfigure(encoding=sys.getdefaultencoding())

requirements_dev.txt

@@ -1,4 +1,4 @@
-pyinstaller==4.3
+pyinstaller>=4.10
 setuptools>=42
 setuptools_scm[toml]>=3.4
 wheel