Merge pull request #123 from python-escpos/refactor/misc-issues

Refactor misc issues

doc/api/config.rst

@@ -1,5 +1,5 @@
 Config
----------
+------
 Module :py:mod:`escpos.config`
 
 .. automodule:: escpos.config

escpos/escpos.py

@@ -238,12 +238,12 @@ class Escpos(object):
 
         (width, height) = image.size
         self._raw(S_RASTER_N)
-        headerX = int(width / 8)
+        header_x = int(width / 8)
-        headerY = height
+        header_y = height
-        buf = "{0:02X}".format((headerX & 0xff))
+        buf = "{0:02X}".format((header_x & 0xff))
-        buf += "{0:02X}".format(((headerX >> 8) & 0xff))
+        buf += "{0:02X}".format(((header_x >> 8) & 0xff))
-        buf += "{0:02X}".format((headerY & 0xff))
+        buf += "{0:02X}".format((header_y & 0xff))
-        buf += "{0:02X}".format(((headerY >> 8) & 0xff))
+        buf += "{0:02X}".format(((header_y >> 8) & 0xff))
         #self._raw(binascii.unhexlify(buf))
         for y in range(height):
             for x in range(width):
@@ -550,8 +550,8 @@ class Escpos(object):
         :param columns: amount of columns
         :return: None
         """
-        colCount = self.columns if columns is None else columns
+        col_count = self.columns if columns is None else columns
-        self.text(textwrap.fill(txt, colCount))
+        self.text(textwrap.fill(txt, col_count))
 
     def set(self, align='left', font='a', text_type='normal', width=1, height=1, density=9, invert=False, smooth=False, flip=False):
         """ Set text properties by sending them to the printer
@@ -733,7 +733,7 @@ class Escpos(object):
         :raises: :py:exc:`~escpos.exceptions.TabPosError`
         """
         # Set tab positions
-        if pos < 1 or pos > 16:
+        if not (1 <= pos <= 16):
             raise TabPosError()
         else:
             self._raw(CTL_SET_HT + six.int2byte(pos))

escpos/printer.py

@@ -17,7 +17,7 @@ import usb.util
 import serial
 import socket
 
-from .escpos import *
+from .escpos import Escpos
 from .exceptions import *
 
 

test/test_cli.py

@@ -28,6 +28,7 @@ printer:
     testfile=DEVFILE,
 )
 
+
 class TestCLI:
     """ Contains setups, teardowns, and tests for CLI
     """

test/test_function_text.py

@@ -21,6 +21,7 @@ import filecmp
 
 devfile = 'testfile'
 
+
 def setup_testfile():
     """create a testfile as devfile"""
     fhandle = open(devfile, 'a')
@@ -29,10 +30,12 @@ def setup_testfile():
     finally:
         fhandle.close()
 
+
 def teardown_testfile():
     """destroy testfile again"""
     os.remove(devfile)
 
+
 @with_setup(setup_testfile, teardown_testfile)
 def test_function_text_dies_ist_ein_test_lf():
     """test the text printing function with simple string and compare output"""

test/test_load_module.py

@@ -19,6 +19,7 @@ import os
 
 devfile = 'testfile'
 
+
 def setup_testfile():
     """create a testfile as devfile"""
     fhandle = open(devfile, 'a')
@@ -27,10 +28,12 @@ def setup_testfile():
     finally:
         fhandle.close()
 
+
 def teardown_testfile():
     """destroy testfile again"""
     os.remove(devfile)
 
+
 @with_setup(setup_testfile, teardown_testfile)
 def test_instantiation():
     """test the instantiation of a escpos-printer class and basic printing"""