Remove builtins / py2 imports (#45)

* remove builtins * remove py2 imports
matmair · Jun 22, 2024 · df4aac8 · df4aac8
1 parent 4bbf4b7
commit df4aac8
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 20 deletions.
diff --git a/brother_ql/backends/generic.py b/brother_ql/backends/generic.py
@@ -1,5 +1,4 @@
 
-from builtins import bytes
 
 import logging
 

diff --git a/brother_ql/backends/linux_kernel.py b/brother_ql/backends/linux_kernel.py
@@ -5,8 +5,6 @@
 Works on Linux.
 """
 
-from builtins import str
-
 import glob, os, time, select
 
 from .generic import BrotherQLBackendGeneric

diff --git a/brother_ql/backends/network.py b/brother_ql/backends/network.py
@@ -5,8 +5,6 @@
 Works cross-platform.
 """
 
-from builtins import str
-
 import socket, time, select
 
 from .generic import BrotherQLBackendGeneric

diff --git a/brother_ql/backends/pyusb.py b/brother_ql/backends/pyusb.py
@@ -8,8 +8,6 @@
 Install via `pip install pyusb`
 """
 
-from builtins import str, bytes
-
 import time
 
 import usb.core

diff --git a/brother_ql/raster.py b/brother_ql/raster.py
@@ -7,8 +7,6 @@
 :py:class:`BrotherQLRaster`.
 """
 
-from builtins import bytes
-
 import struct
 import logging
 
@@ -28,11 +26,7 @@
                              modesetting
 
 from . import BrotherQLError, BrotherQLUnsupportedCmd, BrotherQLUnknownModel, BrotherQLRasterError
-
-try:
-    from io import BytesIO
-except: # Py2
-    from cStringIO import StringIO as BytesIO
+from io import BytesIO
 
 logger = logging.getLogger(__name__)
 

diff --git a/brother_ql/reader.py b/brother_ql/reader.py
@@ -8,8 +8,6 @@
 from PIL import Image
 from PIL.ImageOps import colorize
 
-from builtins import bytes
-
 logger = logging.getLogger(__name__)
 
 OPCODES = {
@@ -119,10 +117,7 @@
 ]
 
 def hex_format(data):
-    try: # Py3
-        return ' '.join('{:02X}'.format(byte) for byte in data)
-    except ValueError: # Py2
-        return ' '.join('{:02X}'.format(ord(byte)) for byte in data)
+    return ' '.join('{:02X}'.format(byte) for byte in data)
 
 def chunker(data, raise_exception=False):
     """
Original file line number	Diff line number	Diff line change
		@@ -1,5 +1,4 @@

		from builtins import bytes

		import logging

Expand Down