From b8dfd47422e74d8e48067638b05ff52536ae6a0e Mon Sep 17 00:00:00 2001 From: Patrick Kanzler Date: Thu, 10 Aug 2023 22:09:29 +0200 Subject: [PATCH] sort with isort --- doc/conf.py | 3 +- examples/barcodes.py | 1 - examples/codepage_tables.py | 9 ++- examples/docker-flask/app.py | 3 +- examples/software_barcode.py | 1 - examples/weather.py | 6 +- setup.py | 2 +- src/escpos/capabilities.py | 18 ++--- src/escpos/cli.py | 5 +- src/escpos/config.py | 4 +- src/escpos/escpos.py | 115 +++++++++++++++------------- src/escpos/image.py | 1 + src/escpos/magicencode.py | 8 +- src/escpos/printer.py | 3 +- test/conftest.py | 1 + test/test_abstract_base_class.py | 8 +- test/test_cli.py | 6 +- test/test_function_barcode.py | 7 +- test/test_function_buzzer.py | 2 +- test/test_function_cashdraw.py | 3 +- test/test_function_check_barcode.py | 3 +- test/test_function_image.py | 1 - test/test_function_linedisplay.py | 2 +- test/test_function_panel_button.py | 2 +- test/test_function_qr_non-native.py | 6 +- test/test_function_set.py | 4 +- test/test_function_softbarcode.py | 3 +- test/test_function_text.py | 9 ++- test/test_functions.py | 1 + test/test_load_module.py | 2 +- test/test_magicencode.py | 11 +-- test/test_printer_file.py | 5 +- test/test_printer_network.py | 8 +- test/test_profile.py | 3 +- test/test_raise_arbitrary_error.py | 3 +- test/test_with_statement.py | 4 +- 36 files changed, 147 insertions(+), 126 deletions(-) diff --git a/doc/conf.py b/doc/conf.py index 5fc6101..0c07a38 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -12,9 +12,8 @@ # All configuration values have a default; values that are commented out # serve to show the default. -import sys import os - +import sys from importlib.metadata import version as imp_version on_rtd = os.getenv("READTHEDOCS") == "True" diff --git a/examples/barcodes.py b/examples/barcodes.py index 16c8083..9b13544 100644 --- a/examples/barcodes.py +++ b/examples/barcodes.py @@ -1,6 +1,5 @@ from escpos.printer import Usb - # Adapt to your needs p = Usb(0x0416, 0x5011, profile="TM-T88II") diff --git a/examples/codepage_tables.py b/examples/codepage_tables.py index dcec2a3..b3a0c3c 100644 --- a/examples/codepage_tables.py +++ b/examples/codepage_tables.py @@ -2,18 +2,19 @@ """ -import six import sys +import six + from escpos import printer from escpos.constants import ( CODEPAGE_CHANGE, - ESC, - CTL_LF, - CTL_FF, CTL_CR, + CTL_FF, CTL_HT, + CTL_LF, CTL_VT, + ESC, ) diff --git a/examples/docker-flask/app.py b/examples/docker-flask/app.py index dc66b3f..f34a8e5 100644 --- a/examples/docker-flask/app.py +++ b/examples/docker-flask/app.py @@ -1,6 +1,7 @@ -from escpos.printer import CupsPrinter from flask import Flask +from escpos.printer import CupsPrinter + # Initialize Flask app app = Flask(__name__) diff --git a/examples/software_barcode.py b/examples/software_barcode.py index 7c949dd..15b81bc 100644 --- a/examples/software_barcode.py +++ b/examples/software_barcode.py @@ -1,6 +1,5 @@ from escpos.printer import Usb - # Adapt to your needs p = Usb(0x0416, 0x5011, profile="POS-5890") diff --git a/examples/weather.py b/examples/weather.py index 033f3b9..1469dbf 100644 --- a/examples/weather.py +++ b/examples/weather.py @@ -13,12 +13,12 @@ # Check out his github: https://github.com/AdamWhitcroft/climacons -from datetime import datetime import calendar -import urllib import json -import time import os +import time +import urllib +from datetime import datetime from escpos.printer import Usb diff --git a/setup.py b/setup.py index 898a51b..64cf5b9 100755 --- a/setup.py +++ b/setup.py @@ -2,8 +2,8 @@ import os import sys -from setuptools import find_packages, setup +from setuptools import find_packages, setup base_dir = os.path.dirname(__file__) src_dir = os.path.join(base_dir, "src") diff --git a/src/escpos/capabilities.py b/src/escpos/capabilities.py index 7294717..763aa1c 100644 --- a/src/escpos/capabilities.py +++ b/src/escpos/capabilities.py @@ -1,20 +1,18 @@ -import re -from os import environ, path import atexit -import pickle import logging +import pickle +import platform +import re import time -import importlib_resources +from contextlib import ExitStack +from os import environ, path +from tempfile import mkdtemp +from typing import Any, Dict +import importlib_resources import six import yaml -from contextlib import ExitStack -from tempfile import mkdtemp -import platform - -from typing import Any, Dict - logging.basicConfig() logger = logging.getLogger(__name__) diff --git a/src/escpos/cli.py b/src/escpos/cli.py index 64eb077..1c0bb39 100644 --- a/src/escpos/cli.py +++ b/src/escpos/cli.py @@ -18,9 +18,10 @@ except ImportError: # this CLI works nevertheless without argcomplete pass # noqa import sys + import six -from . import config -from . import version + +from . import config, version # Must be defined before it's used in DEMO_FUNCTIONS diff --git a/src/escpos/config.py b/src/escpos/config.py index 8fdafb0..380c956 100644 --- a/src/escpos/config.py +++ b/src/escpos/config.py @@ -6,11 +6,11 @@ This module contains the implementations of abstract base class :py:class:`Confi import os + import appdirs import yaml -from . import printer -from . import exceptions +from . import exceptions, printer class Config(object): diff --git a/src/escpos/escpos.py b/src/escpos/escpos.py index 9b46011..bfee881 100644 --- a/src/escpos/escpos.py +++ b/src/escpos/escpos.py @@ -11,80 +11,87 @@ This module contains the abstract base class :py:class:`Escpos`. """ -import qrcode import textwrap -import six +from abc import ABCMeta, abstractmethod # abstract base class support from re import match as re_match import barcode +import qrcode +import six from barcode.writer import ImageWriter +from escpos.capabilities import get_profile +from escpos.image import EscposImage + from .constants import ( - ESC, - GS, - NUL, - QR_ECLEVEL_L, - QR_ECLEVEL_M, - QR_ECLEVEL_H, - QR_ECLEVEL_Q, - SHEET_ROLL_MODE, - SHEET_SLIP_MODE, - SLIP_PRINT_AND_EJECT, - SLIP_SELECT, - SLIP_EJECT, -) -from .constants import ( - QR_MODEL_1, - QR_MODEL_2, - QR_MICRO, - BARCODE_TYPES, + BARCODE_FONT_A, + BARCODE_FONT_B, + BARCODE_FORMATS, BARCODE_HEIGHT, - BARCODE_WIDTH, -) -from .constants import BARCODE_FONT_A, BARCODE_FONT_B, BARCODE_FORMATS -from .constants import ( - BARCODE_TXT_OFF, - BARCODE_TXT_BTH, BARCODE_TXT_ABV, BARCODE_TXT_BLW, -) -from .constants import TXT_SIZE, TXT_NORMAL -from .constants import SET_FONT -from .constants import LINESPACING_FUNCS, LINESPACING_RESET -from .constants import LINE_DISPLAY_OPEN, LINE_DISPLAY_CLEAR, LINE_DISPLAY_CLOSE -from .constants import ( - CD_KICK_DEC_SEQUENCE, - CD_KICK_5, - CD_KICK_2, - PAPER_FULL_CUT, - PAPER_PART_CUT, + BARCODE_TXT_BTH, + BARCODE_TXT_OFF, + BARCODE_TYPES, + BARCODE_WIDTH, BUZZER, -) -from .constants import HW_RESET, HW_SELECT, HW_INIT -from .constants import ( - CTL_VT, + CD_KICK_2, + CD_KICK_5, + CD_KICK_DEC_SEQUENCE, CTL_CR, CTL_FF, CTL_LF, CTL_SET_HT, + CTL_VT, + ESC, + GS, + HW_INIT, + HW_RESET, + HW_SELECT, + LINE_DISPLAY_CLEAR, + LINE_DISPLAY_CLOSE, + LINE_DISPLAY_OPEN, + LINESPACING_FUNCS, + LINESPACING_RESET, + NUL, PANEL_BUTTON_OFF, PANEL_BUTTON_ON, + PAPER_FULL_CUT, + PAPER_PART_CUT, + QR_ECLEVEL_H, + QR_ECLEVEL_L, + QR_ECLEVEL_M, + QR_ECLEVEL_Q, + QR_MICRO, + QR_MODEL_1, + QR_MODEL_2, + RT_MASK_LOWPAPER, + RT_MASK_NOPAPER, + RT_MASK_ONLINE, + RT_MASK_PAPER, + RT_STATUS_ONLINE, + RT_STATUS_PAPER, + SET_FONT, + SHEET_ROLL_MODE, + SHEET_SLIP_MODE, + SLIP_EJECT, + SLIP_PRINT_AND_EJECT, + SLIP_SELECT, + TXT_NORMAL, + TXT_SIZE, + TXT_STYLE, +) +from .exceptions import ( + BarcodeCodeError, + BarcodeSizeError, + BarcodeTypeError, + CashDrawerError, + ImageWidthError, + SetVariableError, + TabPosError, ) -from .constants import TXT_STYLE -from .constants import RT_STATUS_ONLINE, RT_MASK_ONLINE -from .constants import RT_STATUS_PAPER, RT_MASK_PAPER, RT_MASK_LOWPAPER, RT_MASK_NOPAPER - -from .exceptions import BarcodeTypeError, BarcodeSizeError, TabPosError -from .exceptions import CashDrawerError, SetVariableError, BarcodeCodeError -from .exceptions import ImageWidthError - from .magicencode import MagicEncode -from abc import ABCMeta, abstractmethod # abstract base class support -from escpos.image import EscposImage -from escpos.capabilities import get_profile - - # Remove special characters and whitespaces of the supported barcode names, # convert to uppercase and map them to their original names. HW_BARCODE_NAMES = { diff --git a/src/escpos/image.py b/src/escpos/image.py index f622ff8..3396ed5 100644 --- a/src/escpos/image.py +++ b/src/escpos/image.py @@ -10,6 +10,7 @@ This module contains the image format handler :py:class:`EscposImage`. import math + from PIL import Image, ImageOps diff --git a/src/escpos/magicencode.py b/src/escpos/magicencode.py index bc0bb7f..7393ad9 100644 --- a/src/escpos/magicencode.py +++ b/src/escpos/magicencode.py @@ -13,12 +13,14 @@ The code is based on the encoding-code in py-xml-escpos by @fvdsn. """ +import re from builtins import bytes + +import six + +from .codepages import CodePages from .constants import CODEPAGE_CHANGE from .exceptions import Error -from .codepages import CodePages -import six -import re class Encoder(object): diff --git a/src/escpos/printer.py b/src/escpos/printer.py index 913176c..741966f 100644 --- a/src/escpos/printer.py +++ b/src/escpos/printer.py @@ -31,9 +31,10 @@ except ImportError: _CUPSPRINT = False try: - import cups import tempfile + import cups + _CUPSPRINT = True except ImportError: pass diff --git a/test/conftest.py b/test/conftest.py index 2dad088..c7db0e7 100644 --- a/test/conftest.py +++ b/test/conftest.py @@ -1,4 +1,5 @@ import pytest + from escpos.printer import Dummy diff --git a/test/test_abstract_base_class.py b/test/test_abstract_base_class.py index 2e235fd..3154469 100644 --- a/test/test_abstract_base_class.py +++ b/test/test_abstract_base_class.py @@ -1,16 +1,18 @@ #!/usr/bin/python """verifies that the metaclass abc is properly used by ESC/POS -:author: `Patrick Kanzler `_ +:author: `Patrick Kanzler `_ :organization: `python-escpos `_ :copyright: Copyright (c) 2016 Patrick Kanzler :license: MIT """ -import pytest -import escpos.escpos as escpos from abc import ABCMeta +import pytest + +import escpos.escpos as escpos + def test_abstract_base_class_raises(): """test whether the abstract base class raises an exception for ESC/POS""" diff --git a/test/test_cli.py b/test/test_cli.py index ae763cb..cd2828e 100644 --- a/test/test_cli.py +++ b/test/test_cli.py @@ -4,10 +4,12 @@ import os +import shutil +import tempfile + import pytest from scripttest import TestFileEnvironment as TFE -import tempfile -import shutil + import escpos TEST_DIR = tempfile.mkdtemp() + "/cli-test" diff --git a/test/test_function_barcode.py b/test/test_function_barcode.py index b41c5dc..a7a9b9f 100644 --- a/test/test_function_barcode.py +++ b/test/test_function_barcode.py @@ -1,10 +1,11 @@ #!/usr/bin/python -import escpos.printer as printer -from escpos.capabilities import Profile, BARCODE_B -from escpos.exceptions import BarcodeTypeError, BarcodeCodeError import pytest +import escpos.printer as printer +from escpos.capabilities import BARCODE_B, Profile +from escpos.exceptions import BarcodeCodeError, BarcodeTypeError + @pytest.mark.parametrize( "bctype,data,expected", diff --git a/test/test_function_buzzer.py b/test/test_function_buzzer.py index a0a8605..85d5cd7 100644 --- a/test/test_function_buzzer.py +++ b/test/test_function_buzzer.py @@ -1,5 +1,5 @@ -import six import pytest +import six from escpos import printer from escpos.constants import BUZZER diff --git a/test/test_function_cashdraw.py b/test/test_function_cashdraw.py index 95665c6..e976d0d 100644 --- a/test/test_function_cashdraw.py +++ b/test/test_function_cashdraw.py @@ -1,8 +1,9 @@ #!/usr/bin/python +import pytest + import escpos.printer as printer from escpos.exceptions import CashDrawerError -import pytest def test_raise_CashDrawerError(): diff --git a/test/test_function_check_barcode.py b/test/test_function_check_barcode.py index 6cc9fc9..80e3a96 100644 --- a/test/test_function_check_barcode.py +++ b/test/test_function_check_barcode.py @@ -2,9 +2,10 @@ # -*- coding: utf-8 -*- -import escpos.printer as printer import pytest +import escpos.printer as printer + @pytest.mark.parametrize( "bctype,data", diff --git a/test/test_function_image.py b/test/test_function_image.py index 2f1a3d2..981d536 100644 --- a/test/test_function_image.py +++ b/test/test_function_image.py @@ -9,7 +9,6 @@ import pytest - from PIL import Image import escpos.printer as printer diff --git a/test/test_function_linedisplay.py b/test/test_function_linedisplay.py index e9e53cc..693706c 100644 --- a/test/test_function_linedisplay.py +++ b/test/test_function_linedisplay.py @@ -1,7 +1,7 @@ #!/usr/bin/python """tests for line display -:author: `Patrick Kanzler `_ +:author: `Patrick Kanzler `_ :organization: `python-escpos `_ :copyright: Copyright (c) 2017 `python-escpos `_ :license: MIT diff --git a/test/test_function_panel_button.py b/test/test_function_panel_button.py index 39529f6..5540771 100644 --- a/test/test_function_panel_button.py +++ b/test/test_function_panel_button.py @@ -1,7 +1,7 @@ #!/usr/bin/python """tests for panel button function -:author: `Patrick Kanzler `_ +:author: `Patrick Kanzler `_ :organization: `python-escpos `_ :copyright: Copyright (c) 2016 `python-escpos `_ :license: MIT diff --git a/test/test_function_qr_non-native.py b/test/test_function_qr_non-native.py index e199e33..f56cc9c 100644 --- a/test/test_function_qr_non-native.py +++ b/test/test_function_qr_non-native.py @@ -2,18 +2,18 @@ # -*- coding: utf-8 -*- """tests for the non-native part of qr() -:author: `Patrick Kanzler `_ +:author: `Patrick Kanzler `_ :organization: `python-escpos `_ :copyright: Copyright (c) 2016 `python-escpos `_ :license: MIT """ -import pytest import mock +import pytest +from PIL import Image from escpos.printer import Dummy -from PIL import Image @mock.patch("escpos.printer.Dummy.image", spec=Dummy) diff --git a/test/test_function_set.py b/test/test_function_set.py index 40bac64..3eff375 100644 --- a/test/test_function_set.py +++ b/test/test_function_set.py @@ -1,9 +1,7 @@ import six import escpos.printer as printer -from escpos.constants import TXT_NORMAL, TXT_STYLE, SET_FONT -from escpos.constants import TXT_SIZE - +from escpos.constants import SET_FONT, TXT_NORMAL, TXT_SIZE, TXT_STYLE # Default test, please copy and paste this block to test set method calls diff --git a/test/test_function_softbarcode.py b/test/test_function_softbarcode.py index 0d55024..e3da685 100644 --- a/test/test_function_softbarcode.py +++ b/test/test_function_softbarcode.py @@ -1,9 +1,10 @@ #!/usr/bin/python -import escpos.printer as printer import barcode.errors import pytest +import escpos.printer as printer + @pytest.fixture def instance(): diff --git a/test/test_function_text.py b/test/test_function_text.py index 8308536..79a2b23 100644 --- a/test/test_function_text.py +++ b/test/test_function_text.py @@ -1,17 +1,18 @@ #!/usr/bin/python """tests for the text printing function -:author: `Patrick Kanzler `_ +:author: `Patrick Kanzler `_ :organization: `python-escpos `_ :copyright: Copyright (c) 2016 `python-escpos `_ :license: MIT """ -import pytest -import mock -from hypothesis import given, assume import hypothesis.strategies as st +import mock +import pytest +from hypothesis import assume, given + from escpos.printer import Dummy diff --git a/test/test_functions.py b/test/test_functions.py index d98336e..abef814 100644 --- a/test/test_functions.py +++ b/test/test_functions.py @@ -1,4 +1,5 @@ import pytest + from escpos.printer import Dummy diff --git a/test/test_load_module.py b/test/test_load_module.py index b5daa70..c7c4d54 100644 --- a/test/test_load_module.py +++ b/test/test_load_module.py @@ -1,7 +1,7 @@ #!/usr/bin/python """very basic test cases that load the classes -:author: `Patrick Kanzler `_ +:author: `Patrick Kanzler `_ :organization: `python-escpos `_ :copyright: Copyright (c) 2016 `python-escpos `_ :license: MIT diff --git a/test/test_magicencode.py b/test/test_magicencode.py index c2e89d1..e7ad258 100644 --- a/test/test_magicencode.py +++ b/test/test_magicencode.py @@ -2,19 +2,20 @@ # -*- coding: utf-8 -*- """tests for the magic encode module -:author: `Patrick Kanzler `_ +:author: `Patrick Kanzler `_ :organization: `python-escpos `_ :copyright: Copyright (c) 2016 `python-escpos `_ :license: MIT """ -import pytest -from hypothesis import given, example import hypothesis.strategies as st -from escpos.magicencode import MagicEncode, Encoder -from escpos.katakana import encode_katakana +import pytest +from hypothesis import example, given + from escpos.exceptions import CharCodeError, Error +from escpos.katakana import encode_katakana +from escpos.magicencode import Encoder, MagicEncode class TestEncoder: diff --git a/test/test_printer_file.py b/test/test_printer_file.py index b7c89e4..dcda627 100644 --- a/test/test_printer_file.py +++ b/test/test_printer_file.py @@ -2,16 +2,15 @@ # -*- coding: utf-8 -*- """tests for the File printer -:author: `Patrick Kanzler `_ +:author: `Patrick Kanzler `_ :organization: `python-escpos `_ :copyright: Copyright (c) 2016 `python-escpos `_ :license: MIT """ -import six - import pytest +import six from hypothesis import given, settings from hypothesis.strategies import text diff --git a/test/test_printer_network.py b/test/test_printer_network.py index a1fada1..162d5f6 100644 --- a/test/test_printer_network.py +++ b/test/test_printer_network.py @@ -1,10 +1,12 @@ #!/usr/bin/python -import escpos.printer as printer -import pytest -import mock import socket +import mock +import pytest + +import escpos.printer as printer + @pytest.fixture def instance(): diff --git a/test/test_profile.py b/test/test_profile.py index 7793cb5..8919dd1 100644 --- a/test/test_profile.py +++ b/test/test_profile.py @@ -1,5 +1,6 @@ import pytest -from escpos.capabilities import get_profile, NotSupported, BARCODE_B, Profile + +from escpos.capabilities import BARCODE_B, NotSupported, Profile, get_profile @pytest.fixture diff --git a/test/test_raise_arbitrary_error.py b/test/test_raise_arbitrary_error.py index 307f9e3..475dc02 100644 --- a/test/test_raise_arbitrary_error.py +++ b/test/test_raise_arbitrary_error.py @@ -1,7 +1,7 @@ #!/usr/bin/python """test the raising of errors with the error module -:author: `Patrick Kanzler `_ +:author: `Patrick Kanzler `_ :organization: `python-escpos `_ :copyright: Copyright (c) 2017 `python-escpos `_ :license: MIT @@ -9,6 +9,7 @@ import pytest + import escpos import escpos.exceptions diff --git a/test/test_with_statement.py b/test/test_with_statement.py index 8891d12..2c0f161 100644 --- a/test/test_with_statement.py +++ b/test/test_with_statement.py @@ -1,15 +1,15 @@ #!/usr/bin/python """test the facility which enables usage of the with-statement -:author: `Patrick Kanzler `_ +:author: `Patrick Kanzler `_ :organization: `python-escpos `_ :copyright: Copyright (c) 2016 `python-escpos `_ :license: MIT """ -import escpos.printer as printer import escpos.escpos as escpos +import escpos.printer as printer def test_with_statement():