gnu: python-piexif: Fix patch.
Line-endings in the patch need to be CRLF to meet the patched file's content. * gnu/packages/patches/python-piexif-fix-tests-with-pillow-7.2.patch: Change line-endings of patched lines.
parent
ea0e8022f2
commit
af47145e99
|
@ -15,30 +15,30 @@ index 5d105de..a7cad54 100644
|
||||||
***************
|
***************
|
||||||
*** 9,14 ****
|
*** 9,14 ****
|
||||||
--- 9,15 ----
|
--- 9,15 ----
|
||||||
import time
|
import time
|
||||||
import unittest
|
import unittest
|
||||||
|
|
||||||
+ import PIL
|
+ import PIL
|
||||||
from PIL import Image
|
from PIL import Image
|
||||||
import piexif
|
import piexif
|
||||||
from piexif import _common, ImageIFD, ExifIFD, GPSIFD, TAGS, InvalidImageDataError
|
from piexif import _common, ImageIFD, ExifIFD, GPSIFD, TAGS, InvalidImageDataError
|
||||||
***************
|
***************
|
||||||
*** 580,585 ****
|
*** 580,585 ****
|
||||||
--- 581,597 ----
|
--- 581,597 ----
|
||||||
# test utility methods----------------------------------------------
|
# test utility methods----------------------------------------------
|
||||||
|
|
||||||
def _compare_value(self, v1, v2):
|
def _compare_value(self, v1, v2):
|
||||||
+ if isinstance(v2, PIL.TiffImagePlugin.IFDRational):
|
+ if isinstance(v2, PIL.TiffImagePlugin.IFDRational):
|
||||||
+ v2 = (v2.numerator, v2.denominator)
|
+ v2 = (v2.numerator, v2.denominator)
|
||||||
+ if isinstance(v2, tuple):
|
+ if isinstance(v2, tuple):
|
||||||
+ converted_v2 = []
|
+ converted_v2 = []
|
||||||
+ for el in v2:
|
+ for el in v2:
|
||||||
+ if isinstance(el, PIL.TiffImagePlugin.IFDRational):
|
+ if isinstance(el, PIL.TiffImagePlugin.IFDRational):
|
||||||
+ converted_v2.append((el.numerator, el.denominator))
|
+ converted_v2.append((el.numerator, el.denominator))
|
||||||
+ else:
|
+ else:
|
||||||
+ converted_v2.append(el)
|
+ converted_v2.append(el)
|
||||||
+ v2 = tuple(converted_v2)
|
+ v2 = tuple(converted_v2)
|
||||||
+
|
+
|
||||||
if type(v1) != type(v2):
|
if type(v1) != type(v2):
|
||||||
if isinstance(v1, tuple):
|
if isinstance(v1, tuple):
|
||||||
self.assertEqual(pack_byte(*v1), v2)
|
self.assertEqual(pack_byte(*v1), v2)
|
||||||
|
|
Reference in New Issue