From 4dbbd9e43a626d20ea2ac033cda3597f171703ab Mon Sep 17 00:00:00 2001
From: Jordi Mas <jmas@softcatala.org>
Date: Sat, 3 Aug 2024 14:17:57 +0200
Subject: [PATCH] Simplify code in ini and tmx conversors

---
 src/builder/bazaarfileset.py     |  8 +-------
 src/builder/compressedfileset.py |  2 +-
 src/builder/convertini.py        | 29 +++++++----------------------
 3 files changed, 9 insertions(+), 30 deletions(-)

diff --git a/src/builder/bazaarfileset.py b/src/builder/bazaarfileset.py
index f63c22db..deacf963 100644
--- a/src/builder/bazaarfileset.py
+++ b/src/builder/bazaarfileset.py
@@ -26,13 +26,7 @@ class BazaarFileSet(FileSet):
     def _has_filename(self):
         """Used to identify if the file contains a path (/ and then .)"""
         filename = self.url.split("/")[-1]
-
-        if len(filename) > 0:
-            rslt = self.filename.find(".")
-            if rslt != -1:
-                return True
-
-        return False
+        return "." in filename
 
     def do(self):
         if self._has_filename():
diff --git a/src/builder/compressedfileset.py b/src/builder/compressedfileset.py
index 3f6a03d0..945fbd3b 100644
--- a/src/builder/compressedfileset.py
+++ b/src/builder/compressedfileset.py
@@ -41,7 +41,7 @@ def uncompress(filename, report_error, temp_dir):
             cmd = "tar -Jxf {0} -C {1}".format(filename, temp_dir)
             os.system(cmd)
         else:
-            if report_error is True:
+            if report_error:
                 msg = "Unsupported file extension for filename: {0}"
                 logging.error(msg.format(filename))
 
diff --git a/src/builder/convertini.py b/src/builder/convertini.py
index f24b28c4..18b61ff6 100644
--- a/src/builder/convertini.py
+++ b/src/builder/convertini.py
@@ -27,34 +27,19 @@ def __init__(self, source_file, target_file, output_file):
         self.output_file = output_file
 
     def _parse_line(self, line):
-        key = None
-        value = None
-
         if "=" not in line:
-            return key, value
-
-        values = line.split("=", 1)
-        if len(values) != 2:
-            return key, value
+            return None, None
 
-        key = values[0]
-        value = values[1]
-        value = value.replace('"', "")
-        return key.strip(), value.strip()
+        key, value = line.split("=", 1)
+        return key.strip(), value.strip().replace('"', "")
 
     def _read_source(self):
-        lines = []
         strings = []
         with open(self.source_file) as f:
-            lines = f.readlines()
-
-        for line in lines:
-            key, value = self._parse_line(line)
-            if key is None:
-                continue
-
-            pair = (key.strip(), value.strip())
-            strings.append(pair)
+            for line in f:
+                key, value = self._parse_line(line)
+                if key:
+                    strings.append((key, value))
 
         return strings