TakeV/guix
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

gnu: python-piexif: Fix patch.

Browse source 
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.
This commit is contained in:
Hartmut Goebel 2022-01-18 19:35:03 +01:00
parent ea0e8022f2
commit af47145e99
No known key found for this signature in database
GPG key ID: 634A8DFFD3F631DF
1 changed files with 24 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
gnu/packages/patches/python-piexif-fix-tests-with-pillow-7.2.patch
View file

@ -15,30 +15,30 @@ index 5d105de..a7cad54 100644
***************
*** 9,14 ****
--- 9,15 ----
import time
import unittest
+ import PIL
from PIL import Image
import piexif
from piexif import _common, ImageIFD, ExifIFD, GPSIFD, TAGS, InvalidImageDataError
import time
import unittest
+ import PIL
from PIL import Image
import piexif
from piexif import _common, ImageIFD, ExifIFD, GPSIFD, TAGS, InvalidImageDataError
***************
*** 580,585 ****
--- 581,597 ----
# test utility methods----------------------------------------------
def _compare_value(self, v1, v2):
+ if isinstance(v2, PIL.TiffImagePlugin.IFDRational):
+ v2 = (v2.numerator, v2.denominator)
+ if isinstance(v2, tuple):
+ converted_v2 = []
+ for el in v2:
+ if isinstance(el, PIL.TiffImagePlugin.IFDRational):
+ converted_v2.append((el.numerator, el.denominator))
+ else:
+ converted_v2.append(el)
+ v2 = tuple(converted_v2)
+
if type(v1) != type(v2):
if isinstance(v1, tuple):
self.assertEqual(pack_byte(*v1), v2)
# test utility methods----------------------------------------------
def _compare_value(self, v1, v2):
+ if isinstance(v2, PIL.TiffImagePlugin.IFDRational):
+ v2 = (v2.numerator, v2.denominator)
+ if isinstance(v2, tuple):
+ converted_v2 = []
+ for el in v2:
+ if isinstance(el, PIL.TiffImagePlugin.IFDRational):
+ converted_v2.append((el.numerator, el.denominator))
+ else:
+ converted_v2.append(el)
+ v2 = tuple(converted_v2)
+
if type(v1) != type(v2):
if isinstance(v1, tuple):
self.assertEqual(pack_byte(*v1), v2)