Run pyupgrade

Author: Hugo Osvaldo Barrera

barcode/__init__.py

@@ -69,9 +69,7 @@ def get(name, code=None, writer=None, options=None):
     try:
         barcode = __BARCODE_MAP[name.lower()]
     except KeyError:
-        raise BarcodeNotFoundError(
-            "The barcode {!r} you requested is not known.".format(name)
-        )
+        raise BarcodeNotFoundError(f"The barcode {name!r} you requested is not known.")
     if code is not None:
         return barcode(code, writer, **options)
     else:

barcode/base.py

@@ -31,7 +31,7 @@ def to_ascii(self):
         return "\n".join(code)
 
     def __repr__(self):
-        return "<{}({!r})>".format(self.__class__.__name__, self.get_fullcode())
+        return f"<{self.__class__.__name__}({self.get_fullcode()!r})>"
 
     def build(self):
         raise NotImplementedError

barcode/codex.py

@@ -94,14 +94,14 @@ def __init__(self, pzn, writer=None):
             raise IllegalCharacterError("PZN can only contain numbers.")
         if len(pzn) != self.digits:
             raise NumberOfDigitsError(
-                "PZN must have {} digits, not {}.".format(self.digits, len(pzn))
+                f"PZN must have {self.digits} digits, not {len(pzn)}."
             )
         self.pzn = pzn
-        self.pzn = "{}{}".format(pzn, self.calculate_checksum())
-        super().__init__("PZN-{}".format(self.pzn), writer, add_checksum=False)
+        self.pzn = f"{pzn}{self.calculate_checksum()}"
+        super().__init__(f"PZN-{self.pzn}", writer, add_checksum=False)
 
     def get_fullcode(self):
-        return "PZN-{}".format(self.pzn)
+        return f"PZN-{self.pzn}"
 
     def calculate_checksum(self):
         sum_ = sum(int(x) * int(y) for x, y in enumerate(self.pzn, start=2))

barcode/ean.py

@@ -61,7 +61,7 @@ def __init__(self, ean, writer=None, no_checksum=False, guardbar=False):
                 ean, ean[self.digits] if len(ean) > self.digits else 0
             )
         else:
-            self.ean = "{}{}".format(ean, self.calculate_checksum())
+            self.ean = f"{ean}{self.calculate_checksum()}"
 
         self.guardbar = guardbar
         if guardbar:

barcode/isxn.py

@@ -70,7 +70,7 @@ def __init__(self, isbn, writer=None):
         isbn = isbn.replace("-", "")
         isbn = isbn[: self.digits]
         self.isbn10 = isbn
-        self.isbn10 = "{}{}".format(isbn, self._calculate_checksum())
+        self.isbn10 = f"{isbn}{self._calculate_checksum()}"
         super().__init__("978" + isbn, writer)
 
     def _calculate_checksum(self):
@@ -103,7 +103,7 @@ def __init__(self, issn, writer=None):
         issn = issn.replace("-", "")
         issn = issn[: self.digits]
         self.issn = issn
-        self.issn = "{}{}".format(issn, self._calculate_checksum())
+        self.issn = f"{issn}{self._calculate_checksum()}"
         super().__init__(self.make_ean(), writer)
 
     def _calculate_checksum(self):
@@ -118,7 +118,7 @@ def _calculate_checksum(self):
             return tmp
 
     def make_ean(self):
-        return "977{}00{}".format(self.issn[:7], self._calculate_checksum())
+        return f"977{self.issn[:7]}00{self._calculate_checksum()}"
 
     def __str__(self):
         return self.issn

barcode/pybarcode.py

@@ -45,7 +45,7 @@ def create_barcode(args, parser):
         writer = SVGWriter()
     out = os.path.normpath(os.path.abspath(args.output))
     name = barcode.generate(args.barcode, args.code, writer, out, opts, args.text)
-    print("New barcode saved as {}.".format(name))
+    print(f"New barcode saved as {name}.")
 
 
 def main():

barcode/upc.py

@@ -38,10 +38,10 @@ def __init__(self, upc, writer=None, make_ean=False):
             raise IllegalCharacterError("UPC code can only contain numbers.")
         if len(upc) != self.digits:
             raise NumberOfDigitsError(
-                "UPC must have {} digits, not {}.".format(self.digits, len(upc))
+                f"UPC must have {self.digits} digits, not {len(upc)}."
             )
         self.upc = upc
-        self.upc = "{}{}".format(upc, self.calculate_checksum())
+        self.upc = f"{upc}{self.calculate_checksum()}"
         self.writer = writer or self.default_writer()
 
     def __str__(self):

barcode/writer.py

@@ -50,7 +50,7 @@ def create_svg_object(with_doctype=False):
 
 
 SIZE = "{0:.3f}mm"
-COMMENT = "Autogenerated with python-barcode {}".format(version)
+COMMENT = f"Autogenerated with python-barcode {version}"
 PATH = os.path.dirname(os.path.abspath(__file__))
 
 
@@ -322,7 +322,7 @@ def _init(self, code):
         attributes = {
             "width": "100%",
             "height": "100%",
-            "style": "fill:{}".format(self.background),
+            "style": f"fill:{self.background}",
         }
         _set_attributes(background, **attributes)
         self._group.appendChild(background)
@@ -334,7 +334,7 @@ def _create_module(self, xpos, ypos, width, color):
             "y": SIZE.format(ypos),
             "width": SIZE.format(width),
             "height": SIZE.format(self.module_height),
-            "style": "fill:{};".format(color),
+            "style": f"fill:{color};",
         }
         _set_attributes(element, **attributes)
         self._group.appendChild(element)
@@ -372,12 +372,12 @@ def _finish(self):
 
     def save(self, filename, output):
         if self.compress:
-            _filename = "{}.svgz".format(filename)
+            _filename = f"{filename}.svgz"
             f = gzip.open(_filename, "wb")
             f.write(output)
             f.close()
         else:
-            _filename = "{}.svg".format(filename)
+            _filename = f"{filename}.svg"
             with open(_filename, "wb") as f:
                 f.write(output)
         return _filename
@@ -449,7 +449,7 @@ def _finish(self):
             return self._image
 
         def save(self, filename, output):
-            filename = "{}.{}".format(filename, self.format.lower())
+            filename = f"{filename}.{self.format.lower()}"
             output.save(filename, self.format.upper())
             return filename
 

tests/test_manually.py

@@ -90,4 +90,4 @@ def append_img(x, y):
         obj = "\n".join(objects)
         f.write(HTML.format(version=version, body=obj))
 
-    print("\nNow open {htmlfile} in your browser.".format(htmlfile=HTMLFILE))
+    print(f"\nNow open {HTMLFILE} in your browser.")