Instead of using PIL directly to convert TIFF to PDF, use the existing library of img2pdf

This commit is contained in:
Trenton H
2023-03-20 13:48:00 -07:00
parent cca607f7b8
commit f124228e86
2 changed files with 33 additions and 32 deletions

View File

@@ -14,6 +14,13 @@ from documents.tests.utils import DirectoriesMixin
from documents.tests.utils import FileSystemAssertsMixin
from PIL import Image
try:
import zxingcpp
ZXING_AVAILIBLE = True
except ImportError:
ZXING_AVAILIBLE = False
@override_settings(CONSUMER_BARCODE_SCANNER="PYZBAR")
class TestBarcode(DirectoriesMixin, FileSystemAssertsMixin, TestCase):
@@ -672,10 +679,6 @@ class TestBarcode(DirectoriesMixin, FileSystemAssertsMixin, TestCase):
CONSUMER_ENABLE_BARCODES=True,
CONSUMER_BARCODE_TIFF_SUPPORT=True,
)
@pytest.mark.skipif(
settings.CONSUMER_BARCODE_SCANNER == "ZXING",
reason="zxingcpp has issues with tiff",
)
def test_consume_barcode_tiff_file(self):
"""
GIVEN:
@@ -735,10 +738,6 @@ class TestBarcode(DirectoriesMixin, FileSystemAssertsMixin, TestCase):
CONSUMER_ENABLE_BARCODES=True,
CONSUMER_BARCODE_TIFF_SUPPORT=True,
)
@pytest.mark.skipif(
settings.CONSUMER_BARCODE_SCANNER == "ZXING",
reason="zxingcpp has issues with tiff",
)
def test_consume_barcode_supported_no_extension_file(self):
"""
GIVEN:
@@ -1042,14 +1041,6 @@ class TestAsnBarcodes(DirectoriesMixin, TestCase):
)
try:
import zxingcpp
ZXING_AVAILIBLE = True
except ImportError:
ZXING_AVAILIBLE = False
@pytest.mark.skipif(
not ZXING_AVAILIBLE,
reason="No zxingcpp",
@@ -1057,3 +1048,12 @@ except ImportError:
@override_settings(CONSUMER_BARCODE_SCANNER="ZXING")
class TestBarcodeZxing(TestBarcode):
pass
@pytest.mark.skipif(
not ZXING_AVAILIBLE,
reason="No zxingcpp",
)
@override_settings(CONSUMER_BARCODE_SCANNER="ZXING")
class TestAsnBarcodesZxing(TestAsnBarcodes):
pass