Merged in _Frky/python-barcode (pull request #8)

Fix inconsistency in documentation of writers + add an option to EAN-13 barcode generation

Author: Thorsten Weimann

barcode/ean.py

@@ -37,15 +37,23 @@ class EuropeanArticleNumber13(Barcode):
 
     digits = 12
 
-    def __init__(self, ean, writer=None):
+    def __init__(self, ean, writer=None, **kwargs):
+        no_checksum = False
+        if "no_checksum" in kwargs.keys():
+            no_checksum = kwargs["no_checksum"]
         ean = ean[:self.digits]
         if not ean.isdigit():
             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)))
         self.ean = ean
-        self.ean = '{0}{1}'.format(ean, self.calculate_checksum())
+        # If no checksum 
+        if no_checksum:
+            # Add a thirteen char if given in parameter, otherwise pad with zero
+            self.ean = '{0}{1}'.format(ean, ean[self.digits] if len(ean) > self.digits else 0)
+        else:
+            self.ean = '{0}{1}'.format(ean, self.calculate_checksum())
         self.writer = writer or Barcode.default_writer()
 
     def __unicode__(self):

docs/writers/index.rst

@@ -7,8 +7,9 @@ Common Writer Options
 ---------------------
 
 All writer take the following options (specified as keyword arguments
-to `Barcode.save(filename, option=value)` or set via
-`Writer.set_options(option=value)`).
+to `Barcode.save(filename, options)` or set via
+`Writer.set_options(options)`, where `options` is a dictionary where keys are option names and values are option
+values to be set).
 
 .. note::
    See the documentation of the specific writer for special options,