Merge pull request #788 from ladyisatis/feature/bugfix-csc

Bugfix: add mode 'wb' back to open
joaorb64 · Nov 20, 2024 · a372a5b · a372a5b
2 parents c7f50e3 + ca34dd6
commit a372a5b
Show file tree

Hide file tree

Showing 11 changed files with 11 additions and 10 deletions.
diff --git a/TSH.exe b/TSH.exe
diff --git a/src/Helpers/TSHCountryHelper.py b/src/Helpers/TSHCountryHelper.py
@@ -38,7 +38,7 @@ def run(self):
                     r = requests.get(url, allow_redirects=True)
                     tmp_file = TSHResolve('./tmp/countries+states+cities.json.tmp')
 
-                    open(tmp_file).write(r.content)
+                    open(tmp_file, 'wb').write(r.content)
 
                     try:
                         # Test if downloaded JSON is valid
@@ -53,6 +53,7 @@ def run(self):
                         TSHCountryHelper.LoadCountries()
                     except:
                         logger.error("Countries files download failed")
+                        os.remove(tmp_file)
                 except Exception as e:
                     logger.error(
                         "Could not update countries+states+cities.json: "+str(e))

diff --git a/src/i18n/TSH_de.ts b/src/i18n/TSH_de.ts
@@ -1499,7 +1499,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Helpers/TSHCountryHelper.py" line="181"/>
+        <location filename="../Helpers/TSHCountryHelper.py" line="182"/>
         <source>Custom Flags</source>
         <translation type="unfinished"></translation>
     </message>

diff --git a/src/i18n/TSH_en.ts b/src/i18n/TSH_en.ts
@@ -1450,7 +1450,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Helpers/TSHCountryHelper.py" line="181"/>
+        <location filename="../Helpers/TSHCountryHelper.py" line="182"/>
         <source>Custom Flags</source>
         <translation type="unfinished"></translation>
     </message>

diff --git a/src/i18n/TSH_es.ts b/src/i18n/TSH_es.ts
@@ -1512,7 +1512,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Helpers/TSHCountryHelper.py" line="181"/>
+        <location filename="../Helpers/TSHCountryHelper.py" line="182"/>
         <source>Custom Flags</source>
         <translation type="unfinished"></translation>
     </message>

diff --git a/src/i18n/TSH_fr.ts b/src/i18n/TSH_fr.ts
@@ -1559,7 +1559,7 @@ p, li { white-space: pre-wrap; }
         <translation>Veuillez vérifier que votre URL de tournoi est correctement formatée et pointe vers un évènement existant, puis réessayer.</translation>
     </message>
     <message>
-        <location filename="../Helpers/TSHCountryHelper.py" line="181"/>
+        <location filename="../Helpers/TSHCountryHelper.py" line="182"/>
         <source>Custom Flags</source>
         <translation>Drapeaux additionnels</translation>
     </message>

diff --git a/src/i18n/TSH_it.ts b/src/i18n/TSH_it.ts
@@ -1450,7 +1450,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Helpers/TSHCountryHelper.py" line="181"/>
+        <location filename="../Helpers/TSHCountryHelper.py" line="182"/>
         <source>Custom Flags</source>
         <translation type="unfinished"></translation>
     </message>

diff --git a/src/i18n/TSH_ja.ts b/src/i18n/TSH_ja.ts
@@ -1515,7 +1515,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Helpers/TSHCountryHelper.py" line="181"/>
+        <location filename="../Helpers/TSHCountryHelper.py" line="182"/>
         <source>Custom Flags</source>
         <translation type="unfinished"></translation>
     </message>

diff --git a/src/i18n/TSH_pt-BR.ts b/src/i18n/TSH_pt-BR.ts
@@ -1578,7 +1578,7 @@ p, li { white-space: pre-wrap; }
         <translation>Certifique-se de que a URL está no formato correto e que o evento existe.</translation>
     </message>
     <message>
-        <location filename="../Helpers/TSHCountryHelper.py" line="181"/>
+        <location filename="../Helpers/TSHCountryHelper.py" line="182"/>
         <source>Custom Flags</source>
         <translation>Bandeiras customizadas</translation>
     </message>

diff --git a/src/i18n/TSH_zh-CN.ts b/src/i18n/TSH_zh-CN.ts
@@ -1450,7 +1450,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Helpers/TSHCountryHelper.py" line="181"/>
+        <location filename="../Helpers/TSHCountryHelper.py" line="182"/>
         <source>Custom Flags</source>
         <translation type="unfinished"></translation>
     </message>

diff --git a/src/i18n/TSH_zh-TW.ts b/src/i18n/TSH_zh-TW.ts
@@ -1450,7 +1450,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Helpers/TSHCountryHelper.py" line="181"/>
+        <location filename="../Helpers/TSHCountryHelper.py" line="182"/>
         <source>Custom Flags</source>
         <translation type="unfinished"></translation>
     </message>