Tidy up some superfluous code

Author: WhyNotHugo

barcode/__init__.py

@@ -75,8 +75,8 @@ def get(name, code=None, writer=None, options=None):
         raise BarcodeNotFoundError(f"The barcode {name!r} is not known.") from e
     if code is not None:
         return barcode(code, writer, **options)
-    else:
-        return barcode
+
+    return barcode
 
 
 def get_class(name):
@@ -111,10 +111,11 @@ def generate(
     if isinstance(output, str):
         fullname = barcode.save(output, writer_options, text)
         return fullname
-    elif output:
+    if output:
         barcode.write(output, writer_options, text)
-    else:
-        raise TypeError("'output' cannot be None")
+        return None
+
+    raise TypeError("'output' cannot be None")
 
 
 get_barcode = get

barcode/base.py

@@ -60,8 +60,7 @@ def save(self, filename, options=None, text=None):
         """
         output = self.render(options, text) if text else self.render(options)
 
-        _filename = self.writer.save(filename, output)
-        return _filename
+        return self.writer.save(filename, output)
 
     def write(self, fp, options=None, text=None):
         """Renders the barcode and writes it to the file like object
@@ -98,5 +97,4 @@ def render(self, writer_options=None, text=None):
                 options["text"] = self.get_fullcode()
         self.writer.set_options(options)
         code = self.build()
-        raw = self.writer.render(code)
-        return raw
+        return self.writer.render(code)

barcode/codex.py

@@ -60,6 +60,7 @@ def calculate_checksum(self):
         for k, v in code39.MAP.items():
             if check == v[0]:
                 return k
+        return None
 
     def build(self):
         chars = [code39.EDGE]
@@ -108,8 +109,8 @@ def calculate_checksum(self):
         checksum = sum_ % 11
         if checksum == 10:
             raise BarcodeError("Checksum can not be 10 for PZN.")
-        else:
-            return checksum
+
+        return checksum
 
 
 class PZN8(PZN7):
@@ -195,17 +196,20 @@ def look_next():
     def _convert(self, char):
         if self._charset == "A":
             return code128.A[char]
-        elif self._charset == "B":
+        if self._charset == "B":
             return code128.B[char]
-        elif self._charset == "C":
+        if self._charset == "C":
             if char in code128.C:
                 return code128.C[char]
-            elif char.isdigit():
+            if char.isdigit():
                 self._buffer += char
                 if len(self._buffer) == 2:
                     value = int(self._buffer)
                     self._buffer = ""
                     return value
+                return None
+            return None
+        return None
 
     def _try_to_optimize(self, encoded):
         if encoded[1] in code128.TO:

barcode/isxn.py

@@ -76,8 +76,8 @@ def _calculate_checksum(self):
         tmp = sum(x * int(y) for x, y in enumerate(self.isbn10[:9], start=1)) % 11
         if tmp == 10:
             return "X"
-        else:
-            return tmp
+
+        return tmp
 
     def __str__(self):
         return self.isbn10
@@ -113,8 +113,8 @@ def _calculate_checksum(self):
         )
         if tmp == 10:
             return "X"
-        else:
-            return tmp
+
+        return tmp
 
     def make_ean(self):
         return f"977{self.issn[:7]}00{self._calculate_checksum()}"

barcode/upc.py

@@ -47,14 +47,14 @@ def __init__(self, upc, writer=None, make_ean=False):
     def __str__(self):
         if self.ean:
             return "0" + self.upc
-        else:
-            return self.upc
+
+        return self.upc
 
     def get_fullcode(self):
         if self.ean:
             return "0" + self.upc
-        else:
-            return self.upc
+
+        return self.upc
 
     def calculate_checksum(self):
         """Calculates the checksum for UPCA/UPC codes
@@ -72,8 +72,8 @@ def sum_(x, y):
         check = (evensum + oddsum * 3) % 10
         if check == 0:
             return 0
-        else:
-            return 10 - check
+
+        return 10 - check
 
     def build(self):
         """Builds the barcode pattern from 'self.upc'

barcode/writer.py

@@ -364,10 +364,10 @@ def _create_text(self, xpos, ypos):
     def _finish(self):
         if self.compress:
             return self._document.toxml(encoding="UTF-8")
-        else:
-            return self._document.toprettyxml(
-                indent=4 * " ", newl=os.linesep, encoding="UTF-8"
-            )
+
+        return self._document.toprettyxml(
+            indent=4 * " ", newl=os.linesep, encoding="UTF-8"
+        )
 
     def save(self, filename, output):
         if self.compress:

pyproject.toml

@@ -28,6 +28,7 @@ select = [
     "PT",
     "Q",
     "RSE",
+    "RET",
     "SIM",
     "TID",
     "TCH",