From 345d180b151068126a7288684d06920825225888 Mon Sep 17 00:00:00 2001 From: Matthias Mair Date: Thu, 20 Jun 2024 23:44:22 +0200 Subject: [PATCH 1/2] remove usage of __future__ This was only needed for python2, which is EOL since 2020 Closes https://github.com/matmair/brother_ql-inventree/issues/40 --- brother_ql/backends/linux_kernel.py | 1 - brother_ql/backends/network.py | 3 +-- brother_ql/backends/pyusb.py | 1 - brother_ql/cli.py | 1 - brother_ql/conversion.py | 4 ---- pyproject.toml | 1 - 6 files changed, 1 insertion(+), 10 deletions(-) diff --git a/brother_ql/backends/linux_kernel.py b/brother_ql/backends/linux_kernel.py index 5a1c8a0..f6b1850 100755 --- a/brother_ql/backends/linux_kernel.py +++ b/brother_ql/backends/linux_kernel.py @@ -5,7 +5,6 @@ Works on Linux. """ -from __future__ import unicode_literals from builtins import str import glob, os, time, select diff --git a/brother_ql/backends/network.py b/brother_ql/backends/network.py index b32448c..377e6bb 100755 --- a/brother_ql/backends/network.py +++ b/brother_ql/backends/network.py @@ -5,10 +5,9 @@ Works cross-platform. """ -from __future__ import unicode_literals from builtins import str -import socket, os, time, select +import socket, time, select from .generic import BrotherQLBackendGeneric diff --git a/brother_ql/backends/pyusb.py b/brother_ql/backends/pyusb.py index bce5f88..49bab42 100755 --- a/brother_ql/backends/pyusb.py +++ b/brother_ql/backends/pyusb.py @@ -8,7 +8,6 @@ Install via `pip install pyusb` """ -from __future__ import unicode_literals from builtins import str, bytes import time diff --git a/brother_ql/cli.py b/brother_ql/cli.py index 2c70f38..f573f8c 100755 --- a/brother_ql/cli.py +++ b/brother_ql/cli.py @@ -1,7 +1,6 @@ #!/usr/bin/env python # Python standard library -from __future__ import print_function import logging # external dependencies diff --git a/brother_ql/conversion.py b/brother_ql/conversion.py index 6bf3b66..4ec9dec 100755 --- a/brother_ql/conversion.py +++ b/brother_ql/conversion.py @@ -1,14 +1,10 @@ #!/usr/bin/env python -from __future__ import division, unicode_literals -from builtins import str - import logging from PIL import Image import PIL.ImageOps, PIL.ImageChops -from brother_ql.raster import BrotherQLRaster from brother_ql.devicedependent import ENDLESS_LABEL, DIE_CUT_LABEL, ROUND_DIE_CUT_LABEL, PTOUCH_ENDLESS_LABEL from brother_ql.devicedependent import label_type_specs, right_margin_addition from brother_ql import BrotherQLUnsupportedCmd diff --git a/pyproject.toml b/pyproject.toml index 7e198fc..d257b9d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -9,7 +9,6 @@ authors = [ license = {text = "GPL"} dependencies = [ "click", - "future", "packbits", "pillow>=10.0.0", "pyusb", From 5b4ff7865f9c24c25e6e8f66ef0008a0c60323da Mon Sep 17 00:00:00 2001 From: Matthias Mair Date: Thu, 20 Jun 2024 23:46:15 +0200 Subject: [PATCH 2/2] remove from setup as well --- setup.py | 1 - 1 file changed, 1 deletion(-) diff --git a/setup.py b/setup.py index 03c2487..47f9775 100644 --- a/setup.py +++ b/setup.py @@ -39,7 +39,6 @@ platforms = 'any', install_requires = [ "click", - "future", "packbits", "pillow>=10.0.0", "pyusb",