mirror of
				https://github.com/python-escpos/python-escpos
				synced 2025-10-23 09:30:00 +00:00 
			
		
		
		
	start removal of six and improve type annotation (#607)
* fix unfinished Python2 -> 3 translation * remove some six usage * annotate * fix regression in Six removal * mypy: self.enf is always defined * fix return type of cups.py * Usb idVendor/idProduct are integers * self.default_args is always defined * tweak usb_args, PEP589 is better * lp.py: reassure mypy * correctly cast call to CashDrawerError() * update CUPS test * add missing close() method in metaclass * document a bug in typeshed * query_status() returns bytes as seen in constants.py * remove more SIX usage * test examples too * remove type comment where type is annotated * adapt behavior of cups printer to match other implementations --------- Co-authored-by: Patrick Kanzler <dev@pkanzler.de> Co-authored-by: Patrick Kanzler <4189642+patkan@users.noreply.github.com>
This commit is contained in:
		 Alexandre Detiste
					Alexandre Detiste
				
			
				
					committed by
					
						 GitHub
						GitHub
					
				
			
			
				
	
			
			
			 GitHub
						GitHub
					
				
			
						parent
						
							06bdb56937
						
					
				
				
					commit
					66a2e78e16
				
			| @@ -3,8 +3,6 @@ | ||||
|  | ||||
| import sys | ||||
|  | ||||
| import six | ||||
|  | ||||
| from escpos import printer | ||||
| from escpos.constants import ( | ||||
|     CODEPAGE_CHANGE, | ||||
| @@ -38,7 +36,7 @@ def print_codepage(printer, codepage): | ||||
|     """Print a codepage.""" | ||||
|     if codepage.isdigit(): | ||||
|         codepage = int(codepage) | ||||
|         printer._raw(CODEPAGE_CHANGE + six.int2byte(codepage)) | ||||
|         printer._raw(CODEPAGE_CHANGE + bytes((codepage,))) | ||||
|         printer._raw("after") | ||||
|     else: | ||||
|         printer.charcode(codepage) | ||||
| @@ -58,7 +56,9 @@ def print_codepage(printer, codepage): | ||||
|         printer.set() | ||||
|  | ||||
|         for y in range(0, 16): | ||||
|             byte = six.int2byte(x * 16 + y) | ||||
|             byte = bytes( | ||||
|                 (x * 16 + y), | ||||
|             ) | ||||
|  | ||||
|             if byte in (ESC, CTL_LF, CTL_FF, CTL_CR, CTL_HT, CTL_VT): | ||||
|                 byte = " " | ||||
|   | ||||
| @@ -18,8 +18,8 @@ import calendar | ||||
| import json | ||||
| import os | ||||
| import time | ||||
| import urllib | ||||
| from datetime import datetime | ||||
| from urllib.request import urlopen | ||||
|  | ||||
| from escpos.printer import Usb | ||||
|  | ||||
| @@ -93,7 +93,7 @@ url = ( | ||||
|     + LONG | ||||
|     + "?exclude=[alerts,minutely,hourly,flags]&units=si" | ||||
| )  # change last bit to 'us' for Fahrenheit | ||||
| response = urllib.urlopen(url) | ||||
| response = urlopen(url) | ||||
| data = json.loads(response.read()) | ||||
|  | ||||
| printer.print_and_feed(n=1) | ||||
|   | ||||
		Reference in New Issue
	
	Block a user