Fixed issue #31. Modernized tests.

whitie · whitie · commit fe5de7b8b6de · 2016-10-20T17:26:22.000+02:00
diff --git a/barcode/__init__.py b/barcode/__init__.py
@@ -1,12 +1,5 @@
 # -*- coding: utf-8 -*-
 
-from barcode.errors import BarcodeNotFoundError
-from barcode.codex import Code39, PZN, Code128
-from barcode.ean import EAN8, EAN13, JAN
-from barcode.isxn import ISBN10, ISBN13, ISSN
-from barcode.upc import UPCA
-from barcode.itf import ITF
-
 """
 
 pyBarcode
@@ -41,6 +34,12 @@
     'Topic :: Multimedia :: Graphics',
 ]
 
+from barcode.errors import BarcodeNotFoundError
+from barcode.codex import Code39, PZN, Code128
+from barcode.ean import EAN8, EAN13, JAN
+from barcode.isxn import ISBN10, ISBN13, ISSN
+from barcode.upc import UPCA
+from barcode.itf import ITF
 
 try:
     _strbase = basestring  # lint:ok
diff --git a/barcode/codex.py b/barcode/codex.py
@@ -73,10 +73,10 @@ def build(self):
         chars.append(code39.EDGE)
         return [code39.MIDDLE.join(chars)]
 
-    def render(self, writer_options):
+    def render(self, writer_options, text=None):
         options = dict(module_width=MIN_SIZE, quiet_zone=MIN_QUIET_ZONE)
         options.update(writer_options or {})
-        return Barcode.render(self, options)
+        return Barcode.render(self, options, text)
 
 
 class PZN(Code39):
@@ -246,7 +246,7 @@ def build(self):
         code += '11'
         return [code]
 
-    def render(self, writer_options):
+    def render(self, writer_options, text=None):
         options = dict(module_width=MIN_SIZE, quiet_zone=MIN_QUIET_ZONE)
         options.update(writer_options or {})
-        return Barcode.render(self, options)
+        return Barcode.render(self, options, text)
diff --git a/barcode/ean.py b/barcode/ean.py
@@ -105,10 +105,10 @@ def to_ascii(self):
             code[i] = line.replace('1', '|').replace('0', ' ')
         return '\n'.join(code)
 
-    def render(self, writer_options=None):
+    def render(self, writer_options=None, text=None):
         options = dict(module_width=SIZES['SC2'])
         options.update(writer_options or {})
-        return Barcode.render(self, options)
+        return Barcode.render(self, options, text)
 
 
 class JapanArticleNumber(EuropeanArticleNumber13):
diff --git a/barcode/itf.py b/barcode/itf.py
@@ -74,8 +74,8 @@ def build(self):
                 raw += '0' * self.narrow
         return [raw]
 
-    def render(self, writer_options):
+    def render(self, writer_options, text=None):
         options = dict(module_width=MIN_SIZE/self.narrow,
                        quiet_zone=MIN_QUIET_ZONE)
         options.update(writer_options or {})
-        return Barcode.render(self, options)
+        return Barcode.render(self, options, text)
diff --git a/barcode/upc.py b/barcode/upc.py
@@ -6,6 +6,11 @@
 from barcode.charsets import upc as _upc
 from barcode.errors import *
 
+try:
+    reduce
+except NameError:
+    from functools import reduce
+
 """Module: barcode.upc
 
 :Provided barcodes: UPC-A
@@ -101,9 +106,9 @@ def to_ascii(self):
             code[i] = line.replace('1', '|').replace('0', '_')
         return '\n'.join(code)
 
-    def render(self, writer_options=None):
+    def render(self, writer_options=None, text=None):
         options = dict(module_width=0.33)
         options.update(writer_options or {})
-        return Barcode.render(self, options)
+        return Barcode.render(self, options, text)
 
 UPCA = UniversalProductCodeA
diff --git a/test.py b/test.py
@@ -26,12 +26,11 @@
 TESTPATH = os.path.join(PATH, 'tests')
 HTMLFILE = os.path.join(TESTPATH, 'index.html')
 
-HTML = """<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-    "http://www.w3.org/TR/html4/strict.dtd">
+HTML = """<!DOCTYPE html>
 <html>
     <head>
+        <meta charset="utf-8">
         <title>pyBarcode {version} Test</title>
-        <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     </head>
     <body>
         <h1>pyBarcode {version} Tests</h1>
@@ -40,12 +39,11 @@
 </html>
 """
 
-OBJECTS = ('<p><h2>{name}</h2><br />\n'
-           '<object data="{filename}" type="image/svg+xml">\n'
-           '<param name="src" value="{filename}" /></object>')
+OBJECTS = ('<p><h2>{name}</h2><br>\n'
+           '<img src="{filename}" alt="SVG {name}">\n')
 
-IMAGES = ('<h3>As PNG-Image</h3><br />\n'
-          '<img src="{filename}" alt="{name}" /></p>\n')
+IMAGES = ('<h3>As PNG-Image</h3><br>\n'
+          '<img src="{filename}" alt="PNG {name}"></p>\n')
 
 NO_PIL = '<h3>PIL was not found. No PNG-Image created.</h3></p>\n'
 
@@ -82,20 +80,22 @@ def test():
             options['center_text'] = False
         else:
             options['center_text'] = True
-        filename = bcode.save(os.path.join(TESTPATH, codename), options)
+        filename = bcode.save(os.path.join(TESTPATH, codename),
+                              options=options)
         print('Code: {0}, Input: {1}, Output: {2}'.format(
             bcode.name, code, bcode.get_fullcode()))
-        append(filename, bcode.name)
+        append(os.path.basename(filename), bcode.name)
         if ImageWriter is not None:
             bcodec = get_barcode_class(codename)
             bcode = bcodec(code, writer=ImageWriter())
             opts = dict(font_size=14, text_distance=1)
             if codename.startswith('i'):
                 opts['center_text'] = False
             else:
-                options['center_text'] = True
-            filename = bcode.save(os.path.join(TESTPATH, codename), opts)
-            append_img(filename, bcode.name)
+                opts['center_text'] = True
+            filename = bcode.save(os.path.join(TESTPATH, codename),
+                                  options=opts)
+            append_img(os.path.basename(filename), bcode.name)
         else:
             objects.append(NO_PIL)
     # Save htmlfile with all objects
