ruff: Enable and autofix some extra rules

Author: WhyNotHugo

barcode/base.py

@@ -59,10 +59,7 @@ def save(self, filename, options=None, text=None):
         :returns: The full filename with extension.
         :rtype: String
         """
-        if text:
-            output = self.render(options, text)
-        else:
-            output = self.render(options)
+        output = self.render(options, text) if text else self.render(options)
 
         _filename = self.writer.save(filename, output)
         return _filename

barcode/codex.py

@@ -183,15 +183,13 @@ def look_next():
         elif self._charset == "B":
             if look_next():
                 codes = self._new_charset("C")
-            elif char not in code128.B:
-                if char in code128.A:
-                    codes = self._new_charset("A")
+            elif char not in code128.B and char in code128.A:
+                codes = self._new_charset("A")
         elif self._charset == "A":
             if look_next():
                 codes = self._new_charset("C")
-            elif char not in code128.A:
-                if char in code128.B:
-                    codes = self._new_charset("B")
+            elif char not in code128.A and char in code128.B:
+                codes = self._new_charset("B")
         return codes
 
     def _convert(self, char):

barcode/isxn.py

@@ -45,9 +45,8 @@ def __init__(self, isbn, writer=None):
         self.isbn13 = isbn
         if isbn[:3] not in ("978", "979"):
             raise WrongCountryCodeError("ISBN must start with 978 or 979.")
-        if isbn[:3] == "979":
-            if isbn[3:5] not in ("10", "11"):
-                raise BarcodeError("ISBN must start with 97910 or 97911.")
+        if isbn[:3] == "979" and isbn[3:5] not in ("10", "11"):
+            raise BarcodeError("ISBN must start with 97910 or 97911.")
         super().__init__(isbn, writer)
 
 

barcode/writer.py

@@ -348,10 +348,7 @@ def _create_module(self, xpos, ypos, width, color):
     def _create_text(self, xpos, ypos):
         # check option to override self.text with self.human (barcode as
         # human readable data, can be used to print own formats)
-        if self.human != "":
-            barcodetext = self.human
-        else:
-            barcodetext = self.text
+        barcodetext = self.human if self.human != "" else self.text
         for subtext in barcodetext.split("\n"):
             element = self._document.createElement("text")
             attributes = {

pyproject.toml

@@ -19,7 +19,7 @@ select = [
     # "N",
     "C4",
     "PT",
-    # "SIM",
+    "SIM",
     "TID",
 ]
 target-version = "py37"

tests/test_checksums.py

@@ -3,44 +3,44 @@
 
 def test_code39_checksum():
     code39 = get_barcode("code39", "Code39")
-    assert "CODE39W" == code39.get_fullcode()
+    assert code39.get_fullcode() == "CODE39W"
 
 
 def test_pzn_checksum():
     pzn = get_barcode("pzn", "103940")
-    assert "PZN-1039406" == pzn.get_fullcode()
+    assert pzn.get_fullcode() == "PZN-1039406"
 
 
 def test_ean13_checksum():
     ean = get_barcode("ean13", "400614457735")
-    assert "4006144577350" == ean.get_fullcode()
+    assert ean.get_fullcode() == "4006144577350"
 
 
 def test_ean8_checksum():
     ean = get_barcode("ean8", "6032299")
-    assert "60322999" == ean.get_fullcode()
+    assert ean.get_fullcode() == "60322999"
 
 
 def test_jan_checksum():
     jan = get_barcode("jan", "491400614457")
-    assert "4914006144575" == jan.get_fullcode()
+    assert jan.get_fullcode() == "4914006144575"
 
 
 def test_ean14_checksum():
     ean = get_barcode("ean14", "1234567891258")
-    assert "12345678912589" == ean.get_fullcode()
+    assert ean.get_fullcode() == "12345678912589"
 
 
 def test_isbn10_checksum():
     isbn = get_barcode("isbn10", "376926085")
-    assert "3769260856" == isbn.isbn10
+    assert isbn.isbn10 == "3769260856"
 
 
 def test_isbn13_checksum():
     isbn = get_barcode("isbn13", "978376926085")
-    assert "9783769260854" == isbn.get_fullcode()
+    assert isbn.get_fullcode() == "9783769260854"
 
 
 def test_gs1_128_checksum():
     gs1_128 = get_barcode("gs1_128", "00376401856400470087")
-    assert "00376401856400470087" == gs1_128.get_fullcode()
+    assert gs1_128.get_fullcode() == "00376401856400470087"