From 5209b53e9689ce28dcd045f384633378d619718f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Wi=C5=9Bniewski?= <vuko@vuko.pl>
Date: Thu, 5 Nov 2020 16:18:52 +0100
Subject: [PATCH] convert IFDRational to tuples in tests

This fixes tests with Pillow version >= 7.2.0
---
 tests/s_test.py | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/tests/s_test.py b/tests/s_test.py
index 5d105de..a7cad54 100644
--- a/tests/s_test.py
+++ b/tests/s_test.py
***************
*** 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
***************
*** 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)
'/guix/log/guix.scm'>
<input type='hidden' name='id' value='f89d06d13b0bb35b638264153f46da32a3ac8ee2'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=f89d06d13b0bb35b638264153f46da32a3ac8ee2'>root</a>/<a href='/guix/log/guix.scm?id=f89d06d13b0bb35b638264153f46da32a3ac8ee2'>guix.scm</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/guix.scm?id=f89d06d13b0bb35b638264153f46da32a3ac8ee2&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2022-07-12 01:17:45 +0200'>2022-07-12</span></td><td><a href='/guix/commit/guix.scm?id=4574ef267e543bcac97d9c400f30cb731df29181'>guix: Really export 'define-public'.</a><span class='msg-avail'>...<span class='msg-tooltip'>This is a followup to 3858275962f1ac567b5dce2355035f9eddea0a05, which
didn't have any effect.

* guix.scm: Explicitly use (guix packages) so #:re-export-and-replace
is effective.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2021-09-14 11:50:58 +0200'>2021-09-14</span></td><td><a href='/guix/commit/guix.scm?id=3858275962f1ac567b5dce2355035f9eddea0a05'>guix: Replace 'define-public'.</a><span class='msg-avail'>...<span class='msg-tooltip'>This is a followup to 8531997d2a1e10d574a6e9ab70bc86ade6af4733.

* guix.scm: Use #:re-export-and-replace for 'define-public'.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2021-06-29 00:00:13 +0200'>2021-06-29</span></td><td><a href='/guix/commit/guix.scm?id=e059adcb6001ab0353d969b24030d0c342f8830e'>(guix) no longer pulls in (guix ftp-client).</a><span class='msg-avail'>...<span class='msg-tooltip'>That choice was made in 2014 and never made much sense.

* guix.scm (%public-modules): Remove 'ftp-client'.
</span></span></td><td>Ludovic Courtès</td></tr>