Merged in lasley/python-barcode/feature/ean14 (pull request #11)

Feature/ean14

Author: Thorsten Weimann

.hgsigs

@@ -0,0 +1 @@
+48436ba963f08285ddde3a0c91c27703e2143ebc 0 iQIcBAABCgAGBQJYd7+CAAoJEH3bpLqBuTTPC+UP/0/uJyy0llXpif0nRt3yIy9u+gl+6t8UdO6miPtvWzMHVRgGfgb/tip5MGWxiwR3aPyqnqSZ9m4+W62jIYUGs2pTHZPMK192yMNA8131NOUpugjAjxosigJsDH5NKFG7h9spWjggaBYD80jt2Vbr2YM/xtGWC1hQ3lfLchMXFNs3zjVGcAnA57Vy1uPHTZx0ETkc3vZocRqvrWReU1nZ14i1r6rH2lZIKRQ4kMEpEYYxL9U/gwAwJT/eAlZpr3FMR9FkiYXAdEK4sXxV989WGogPdI8MRAxAj6MA+rO4pdl0aAlQmO7rxePtgppI6d9qx7dm49cXwiroTMDhDpj8jNQoeBVJ+qzc+2o4+f5pdFJH3nGCDhDeiTsnQuAFBw+5B+T99VWODJQqlKgFnZxDuC/Mcg9DVt8O+yu9/+xy/x17ttt3d6yWNfSZ+kkKTLTpnLEWFKeDOYjXGZRu22hskV7sVy6T9gpI8rtShA7oUjOhIfhQ/DWGZphHFOnkBpsFul1Dj7hnAv0wNHlkRl0zkiq9byhHlFADL/TT3Pjuyc+lNScNWP3nC5WVKpepoSM30euYLEN3Ydg+1Tq1mLoM+f1geKiJ7+9tR/NfeoaPcz6FykcU6dYsKfFeo1Os+BK76O0DTSFV+xorzcHwtdQ6ADmQFq274kgDQ/CxqXlnhaEL

README.rst

@@ -34,7 +34,7 @@ The best way is to use pip: `pip install pyBarcode`.
 Provided Barcodes
 -----------------
 
-EAN-8, EAN-13, UPC-A, JAN, ISBN-10, ISBN-13, ISSN, Code 39, Code 128, PZN
+EAN-8, EAN-13, EAN-14, UPC-A, JAN, ISBN-10, ISBN-13, ISSN, Code 39, Code 128, PZN
 
 
 Todo
@@ -147,4 +147,4 @@ Changelog
 
 :v0.2: More tests added.
 
-:v0.1: First release.
+:v0.1: First release.

barcode/__init__.py

@@ -36,7 +36,7 @@
 
 from barcode.errors import BarcodeNotFoundError
 from barcode.codex import Code39, PZN, Code128
-from barcode.ean import EAN8, EAN13, JAN
+from barcode.ean import EAN8, EAN13, EAN14, JAN
 from barcode.isxn import ISBN10, ISBN13, ISSN
 from barcode.upc import UPCA
 from barcode.itf import ITF
@@ -51,7 +51,8 @@
     ean8=EAN8,
     ean13=EAN13,
     ean=EAN13,
-    gtin=EAN13,
+    gtin=EAN14,
+    ean14=EAN14,
     jan=JAN,
     upc=UPCA,
     upca=UPCA,

barcode/ean.py

@@ -8,7 +8,7 @@
 
 """Module: barcode.ean
 
-:Provided barcodes: EAN-13, EAN-8, JAN
+:Provided barcodes: EAN-14, EAN-13, EAN-8, JAN
 """
 __docformat__ = 'restructuredtext en'
 
@@ -149,17 +149,6 @@ class EuropeanArticleNumber8(EuropeanArticleNumber13):
     def __init__(self, ean, writer=None):
         EuropeanArticleNumber13.__init__(self, ean, writer)
 
-    def calculate_checksum(self):
-        """Calculates the checksum for EAN8-Code.
-
-        :returns: The checksum for `self.ean`.
-        :rtype: Integer
-        """
-        def sum_(x, y): return int(x) + int(y)
-        evensum = reduce(sum_, self.ean[::2])
-        oddsum = reduce(sum_, self.ean[1::2])
-        return (10 - ((evensum * 3 + oddsum) % 10)) % 10
-
     def build(self):
         """Builds the barcode pattern from `self.ean`.
 
@@ -176,7 +165,35 @@ def build(self):
         return [code]
 
 
+class EuropeanArticleNumber14(EuropeanArticleNumber13):
+    """Represents an EAN-14 barcode. See EAN13's __init__ for details.
+
+    :parameters:
+        ean : String
+            The ean number as string.
+        writer : barcode.writer Instance
+            The writer to render the barcode (default: SVGWriter).
+    """
+
+    name = 'EAN-14'
+    digits = 13
+
+    def calculate_checksum(self):
+        """Calculates the checksum for EAN13-Code.
+
+        :returns: The checksum for `self.ean`.
+        :rtype: Integer
+        """
+
+        def sum_(x, y): return int(x) + int(y)
+
+        evensum = reduce(sum_, self.ean[::2])
+        oddsum = reduce(sum_, self.ean[1::2])
+        return (10 - (((evensum * 3) + oddsum) % 10)) % 10
+
+
 # Shortcuts
+EAN14 = EuropeanArticleNumber14
 EAN13 = EuropeanArticleNumber13
 EAN8 = EuropeanArticleNumber8
 JAN = JapanArticleNumber

test.py

@@ -50,6 +50,7 @@
 TESTCODES = (
     ('ean8', '40267708'),
     ('ean13', '5901234123457'),
+    ('ean14', '12345678911230'),
     ('upca', '36000291453'),
     ('jan', '4901234567894'),
     ('isbn10', '3-12-517154-7'),