Drop redundant code

Author: Hugo Osvaldo Barrera

barcode/__init__.py

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

barcode/base.py

@@ -4,7 +4,7 @@
 from barcode.writer import SVGWriter
 
 
-class Barcode(object):
+class Barcode:
 
     name = ""
 
@@ -31,7 +31,7 @@ def to_ascii(self):
         return "\n".join(code)
 
     def __repr__(self):
-        return "<{0}({1!r})>".format(self.__class__.__name__, self.get_fullcode())
+        return "<{}({!r})>".format(self.__class__.__name__, self.get_fullcode())
 
     def build(self):
         raise NotImplementedError

barcode/codex.py

@@ -98,14 +98,14 @@ def __init__(self, pzn, writer=None):
             raise IllegalCharacterError("PZN can only contain numbers.")
         if len(pzn) != self.digits:
             raise NumberOfDigitsError(
-                "PZN must have {0} digits, not {1}.".format(self.digits, len(pzn))
+                "PZN must have {} digits, not {}.".format(self.digits, len(pzn))
             )
         self.pzn = pzn
-        self.pzn = "{0}{1}".format(pzn, self.calculate_checksum())
-        Code39.__init__(self, "PZN-{0}".format(self.pzn), writer, add_checksum=False)
+        self.pzn = "{}{}".format(pzn, self.calculate_checksum())
+        Code39.__init__(self, "PZN-{}".format(self.pzn), writer, add_checksum=False)
 
     def get_fullcode(self):
-        return "PZN-{0}".format(self.pzn)
+        return "PZN-{}".format(self.pzn)
 
     def calculate_checksum(self):
         sum_ = sum(int(x) * int(y) for x, y in enumerate(self.pzn, start=2))
@@ -271,10 +271,10 @@ class Gs1_128(Code128):
 
     def __init__(self, code, writer=None):
         code = self.FNC1_CHAR + code
-        super(Gs1_128, self).__init__(code, writer)
+        super().__init__(code, writer)
 
     def get_fullcode(self):
-        return super(Gs1_128, self).get_fullcode()[1:]
+        return super().get_fullcode()[1:]
 
 
 # For pre 0.8 compatibility

barcode/ean.py

@@ -53,18 +53,18 @@ def __init__(self, ean, writer=None, no_checksum=False):
             raise IllegalCharacterError("EAN code can only contain numbers.")
         if len(ean) != self.digits:
             raise NumberOfDigitsError(
-                "EAN must have {0} digits, not {1}.".format(self.digits, len(ean),)
+                "EAN must have {} digits, not {}.".format(self.digits, len(ean),)
             )
         self.ean = ean
         # If no checksum
         if no_checksum:
             # Add a thirteen char if given in parameter,
             # otherwise pad with zero
-            self.ean = "{0}{1}".format(
+            self.ean = "{}{}".format(
                 ean, ean[self.digits] if len(ean) > self.digits else 0
             )
         else:
-            self.ean = "{0}{1}".format(ean, self.calculate_checksum())
+            self.ean = "{}{}".format(ean, self.calculate_checksum())
         self.writer = writer or Barcode.default_writer()
 
     def __unicode__(self):

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 = "{0}{1}".format(isbn, self._calculate_checksum())
+        self.isbn10 = "{}{}".format(isbn, self._calculate_checksum())
         InternationalStandardBookNumber13.__init__(self, "978" + isbn, writer)
 
     def _calculate_checksum(self):
@@ -105,7 +105,7 @@ def __init__(self, issn, writer=None):
         issn = issn.replace("-", "")
         issn = issn[: self.digits]
         self.issn = issn
-        self.issn = "{0}{1}".format(issn, self._calculate_checksum())
+        self.issn = "{}{}".format(issn, self._calculate_checksum())
         EuropeanArticleNumber13.__init__(self, self.make_ean(), writer)
 
     def _calculate_checksum(self):
@@ -120,7 +120,7 @@ def _calculate_checksum(self):
             return tmp
 
     def make_ean(self):
-        return "977{0}00{1}".format(self.issn[:7], self._calculate_checksum())
+        return "977{}00{}".format(self.issn[:7], self._calculate_checksum())
 
     def __unicode__(self):
         return self.issn

barcode/pybarcode.py

@@ -57,7 +57,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 {0}.".format(name))
+    print("New barcode saved as {}.".format(name))
 
 
 def main():

barcode/upc.py

@@ -37,7 +37,7 @@ 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 {0} digits, not {1}.".format(self.digits, len(upc))
+                "UPC must have {} digits, not {}.".format(self.digits, len(upc))
             )
         self.upc = upc
         self.upc = "{}{}".format(upc, self.calculate_checksum())

barcode/writer.py

@@ -47,11 +47,11 @@ def create_svg_object(with_doctype=False):
 
 
 SIZE = "{0:.3f}mm"
-COMMENT = "Autogenerated with python-barcode {0}".format(version)
+COMMENT = "Autogenerated with python-barcode {}".format(version)
 PATH = os.path.dirname(os.path.abspath(__file__))
 
 
-class BaseWriter(object):
+class BaseWriter:
     """Baseclass for all writers.
 
     Initializes the basic writer options. Childclasses can add more
@@ -259,7 +259,7 @@ def _init(self, code):
         attributes = {
             "width": "100%",
             "height": "100%",
-            "style": "fill:{0}".format(self.background),
+            "style": "fill:{}".format(self.background),
         }
         _set_attributes(background, **attributes)
         self._group.appendChild(background)
@@ -271,7 +271,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:{0};".format(color),
+            "style": "fill:{};".format(color),
         }
         _set_attributes(element, **attributes)
         self._group.appendChild(element)
@@ -288,7 +288,7 @@ def _create_text(self, xpos, ypos):
             attributes = {
                 "x": SIZE.format(xpos),
                 "y": SIZE.format(ypos),
-                "style": "fill:{0};font-size:{1}pt;text-anchor:middle;".format(
+                "style": "fill:{};font-size:{}pt;text-anchor:middle;".format(
                     self.foreground, self.font_size,
                 ),
             }
@@ -308,12 +308,12 @@ def _finish(self):
 
     def save(self, filename, output):
         if self.compress:
-            _filename = "{0}.svgz".format(filename)
+            _filename = "{}.svgz".format(filename)
             f = gzip.open(_filename, "wb")
             f.write(output)
             f.close()
         else:
-            _filename = "{0}.svg".format(filename)
+            _filename = "{}.svg".format(filename)
             with open(_filename, "wb") as f:
                 f.write(output)
         return _filename
@@ -364,6 +364,6 @@ def _finish(self):
             return self._image
 
         def save(self, filename, output):
-            filename = "{0}.{1}".format(filename, self.format.lower())
+            filename = "{}.{}".format(filename, self.format.lower())
             output.save(filename, self.format.upper())
             return filename

docs/source/conf.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 #
 # pyBarcode documentation build configuration file, created by
 # sphinx-quickstart on Fri Mar 12 13:29:48 2010.

tests/test_manually.py

@@ -66,7 +66,7 @@ def append_img(x, y):
             options["center_text"] = True
         filename = bcode.save(os.path.join(TESTPATH, codename), options=options)
         print(
-            "Code: {0}, Input: {1}, Output: {2}".format(
+            "Code: {}, Input: {}, Output: {}".format(
                 bcode.name, code, bcode.get_fullcode()
             )
         )