1
0
mirror of https://github.com/python-escpos/python-escpos synced 2025-12-02 09:43:30 +00:00

REFACTOR style and PEP8, fixes #66

This commit is contained in:
Patrick Kanzler
2015-11-27 21:20:12 +01:00
parent 096445631f
commit 07d8e073ae
5 changed files with 128 additions and 152 deletions

View File

@@ -12,9 +12,9 @@ import serial
import socket
from escpos import *
from constants import *
from exceptions import *
class Usb(Escpos):
""" Define USB printer """
@@ -26,14 +26,13 @@ class Usb(Escpos):
@param in_ep : Input end point
@param out_ep : Output end point
"""
self.idVendor = idVendor
self.idVendor = idVendor
self.idProduct = idProduct
self.interface = interface
self.in_ep = in_ep
self.out_ep = out_ep
self.in_ep = in_ep
self.out_ep = out_ep
self.open()
def open(self):
""" Search device on USB tree and set is as escpos device """
self.device = usb.core.find(idVendor=self.idVendor, idProduct=self.idProduct)
@@ -52,7 +51,7 @@ class Usb(Escpos):
self.device.detach_kernel_driver(0)
except usb.core.USBError as e:
if check_driver is not None:
print "Could not detatch kernel driver: %s" % str(e)
print "Could not detach kernel driver: %s" % str(e)
try:
self.device.set_configuration()
@@ -60,12 +59,10 @@ class Usb(Escpos):
except usb.core.USBError as e:
print "Could not set configuration: %s" % str(e)
def _raw(self, msg):
""" Print any command sent in raw format """
self.device.write(self.out_ep, msg, self.interface)
def __del__(self):
""" Release USB interface """
if self.device:
@@ -73,13 +70,12 @@ class Usb(Escpos):
self.device = None
class Serial(Escpos):
""" Define Serial printer """
def __init__(self, devfile="/dev/ttyS0", baudrate=9600, bytesize=8, timeout=1,
parity=serial.PARITY_NONE, stopbits=serial.STOPBITS_ONE,
xonxoff=False , dsrdtr=True):
xonxoff=False, dsrdtr=True):
"""
@param devfile : Device file under dev filesystem
@param baudrate : Baud rate for serial transmission
@@ -91,10 +87,10 @@ class Serial(Escpos):
@param xonxoff : Software flow control
@param dsrdtr : Hardware flow control (False to enable RTS/CTS)
"""
self.devfile = devfile
self.devfile = devfile
self.baudrate = baudrate
self.bytesize = bytesize
self.timeout = timeout
self.timeout = timeout
self.parity = parity
self.stopbits = stopbits
@@ -103,7 +99,6 @@ class Serial(Escpos):
self.open()
def open(self):
""" Setup serial port and set is as escpos device """
self.device = serial.Serial(port=self.devfile, baudrate=self.baudrate,
@@ -116,23 +111,20 @@ class Serial(Escpos):
else:
print "Unable to open serial printer on: %s" % self.devfile
def _raw(self, msg):
""" Print any command sent in raw format """
self.device.write(msg)
def __del__(self):
""" Close Serial interface """
if self.device is not None:
self.device.close()
class Network(Escpos):
""" Define Network printer """
def __init__(self,host,port=9100):
def __init__(self, host, port=9100):
"""
@param host : Printer's hostname or IP address
@param port : Port to write to
@@ -141,7 +133,6 @@ class Network(Escpos):
self.port = port
self.open()
def open(self):
""" Open TCP socket and set it as escpos device """
self.device = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
@@ -150,18 +141,15 @@ class Network(Escpos):
if self.device is None:
print "Could not open socket for %s" % self.host
def _raw(self, msg):
""" Print any command sent in raw format """
self.device.send(msg)
def __del__(self):
""" Close TCP connection """
self.device.close()
class File(Escpos):
""" Define Generic file printer """
@@ -172,7 +160,6 @@ class File(Escpos):
self.devfile = devfile
self.open()
def open(self):
""" Open system file """
self.device = open(self.devfile, "wb")
@@ -180,11 +167,9 @@ class File(Escpos):
if self.device is None:
print "Could not open the specified file %s" % self.devfile
def _raw(self, msg):
""" Print any command sent in raw format """
self.device.write(msg);
self.device.write(msg)
def __del__(self):
""" Close system file """