changeset 1:21c3229ed401

Tidy up
author Ben Croston <ben@fuzzyduckbrewery.co.uk>
date Fri, 12 Aug 2011 21:48:00 +0100
parents 5bd9ee5c0cae
children ad9d9bf61243
files README setup.py zebra.py
diffstat 3 files changed, 8 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/README	Fri Aug 12 21:40:12 2011 +0100
+++ b/README	Fri Aug 12 21:48:00 2011 +0100
@@ -20,10 +20,10 @@
     z.setqueue( printerqueue )
       - Set the printer queue
 
-    z.setup(self, direct_transfer=None, label_height=None, label_width=None)
+    z.setup(direct_transfer=None, label_height=None, label_width=None)
       - Set up the printer
 
-    z.store_graphic(self, name, filename)
+    z.store_graphic(name, filename)
        - Store a graphics .PCX file on printer
 
     z.output(commands)
--- a/setup.py	Fri Aug 12 21:40:12 2011 +0100
+++ b/setup.py	Fri Aug 12 21:48:00 2011 +0100
@@ -7,8 +7,6 @@
 except ImportError:
    from distutils.command.build_py import build_py
 
-PLATFORM_IS_WINDOWS = sys.platform.lower().startswith('win')
-
 classifiers = ['Development Status :: 3 - Alpha',
                'Operating System :: Microsoft :: Windows',
                'Operating System :: Unix',
@@ -19,7 +17,7 @@
 
 long_description = open('README').read()
 
-if PLATFORM_IS_WINDOWS:
+if sys.platform.lower().startswith('win'):
     requires = ['win32print']
 else:
     requires = []
--- a/zebra.py	Fri Aug 12 21:40:12 2011 +0100
+++ b/zebra.py	Fri Aug 12 21:48:00 2011 +0100
@@ -9,7 +9,7 @@
 
 class zebra(object):
     def __init__(self, queue=None):
-        """queue - name of the printer queue as returned by lpstat -d"""
+        """queue - name of the printer queue"""
         self.queue = queue
 
     def _output_unix(self, commands):
@@ -50,7 +50,7 @@
         else:
             return self._getqueues_unix()
 
-    def setqueue(self,queue):
+    def setqueue(self, queue):
         self.queue = queue
 
     def setup(self, direct_transfer=None, label_height=None, label_width=None):
@@ -76,14 +76,14 @@
     z = zebra()
     print 'Printer queues found:',z.getqueues()
     z.setqueue('zebra_python_unittest')
-#    z.setup(direct_transfer=True, label_height=(406,32), label_width=609)    # 3" x 2" label
-#    z.store_graphic('logo','logo.pcx')
+    z.setup(direct_transfer=True, label_height=(406,32), label_width=609)    # 3" x 2" direct transfer label
+    z.store_graphic('logo','logo.pcx')
     label = """
 N
 GG419,40,"logo"
 A40,80,0,4,1,1,N,"Tangerine Duck 4.4%"
 A40,198,0,3,1,1,N,"Duty paid on 39.9l"
-A40,240,0,3,1,1,N,"Gyle: 123     Best Before: 16/09/2011"
+A40,240,0,3,1,1,N,"Gyle: 127     Best Before: 16/09/2011"
 A40,320,0,4,1,1,N,"Pump & Truncheon"
 P1
 """