From 0984c93975ea2bd7062b5a3fcca765b88ccdd45a Mon Sep 17 00:00:00 2001 From: belono Date: Fri, 22 Sep 2023 19:58:26 +0200 Subject: [PATCH] Fix type checking --- src/escpos/printer/serial.py | 9 +++++---- src/escpos/printer/usb.py | 2 +- src/escpos/printer/win32raw.py | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/escpos/printer/serial.py b/src/escpos/printer/serial.py index d6cc9b4..031f34e 100644 --- a/src/escpos/printer/serial.py +++ b/src/escpos/printer/serial.py @@ -11,7 +11,7 @@ import functools import logging -from typing import Optional, Type, Union +from typing import Optional, Union from ..escpos import Escpos from ..exceptions import DeviceNotFoundError @@ -125,12 +125,13 @@ class Serial(Escpos): :raises: :py:exc:`~escpos.exceptions.DeviceNotFoundError` """ - if self._device and self.device.is_open: - self.close() + if self._device: + if self.device and self.device.is_open: + self.close() try: # Open device - self.device: Optional[Type[serial.Serial]] = serial.Serial( + self.device: Optional[serial.Serial] = serial.Serial( port=self.devfile, baudrate=self.baudrate, bytesize=self.bytesize, diff --git a/src/escpos/printer/usb.py b/src/escpos/printer/usb.py index 47fc0ee..b74c0ac 100644 --- a/src/escpos/printer/usb.py +++ b/src/escpos/printer/usb.py @@ -150,7 +150,7 @@ class Usb(Escpos): and detach_kernel_driver(). This helps enable this library to work on Windows. """ - if self._device and self.device.backend.__module__.endswith("libusb1"): + if self.device and self.device.backend.__module__.endswith("libusb1"): check_driver: Optional[bool] = None try: diff --git a/src/escpos/printer/win32raw.py b/src/escpos/printer/win32raw.py index 62fe71f..ee01c27 100644 --- a/src/escpos/printer/win32raw.py +++ b/src/escpos/printer/win32raw.py @@ -114,7 +114,7 @@ class Win32Raw(Escpos): self.device = win32print.OpenPrinter(self.printer_name) if self.device: self.current_job = win32print.StartDocPrinter( - self.device, 1, (job_name, None, "RAW") + hprinter=self.device, level=1, _tuple=(job_name, None, "RAW") ) win32print.StartPagePrinter(self.device) except (AssertionError, pywintypes.error) as e: