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)
510b100a852147c7557d1f277f'>commit</a><a href='/guix/diff/gnu/services/security-token.scm?id=ecdcc19200a6c3510b100a852147c7557d1f277f'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/services/security-token.scm'>
<input type='hidden' name='id' value='ecdcc19200a6c3510b100a852147c7557d1f277f'/><input type='hidden' name='showmsg' value='1'/><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=ecdcc19200a6c3510b100a852147c7557d1f277f&amp;showmsg=1'>root</a>/<a href='/guix/log/gnu?id=ecdcc19200a6c3510b100a852147c7557d1f277f&amp;showmsg=1'>gnu</a>/<a href='/guix/log/gnu/services?id=ecdcc19200a6c3510b100a852147c7557d1f277f&amp;showmsg=1'>services</a>/<a href='/guix/log/gnu/services/security-token.scm?id=ecdcc19200a6c3510b100a852147c7557d1f277f&amp;showmsg=1'>security-token.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/gnu/services/security-token.scm?id=ecdcc19200a6c3510b100a852147c7557d1f277f'>Collapse</a>)</th><th class='left'>Author</th></tr>
<tr class='logheader'><td><span title='2023-12-22 00:31:41 +0100'>2023-12-22</span></td><td class='logsubject'><a href='/guix/commit/gnu/services/security-token.scm?id=3d6583727ec90732ad7bd97808fd4fca8f6d8bdc'>services: Remove unnecessary references to (gnu build shepherd).</a></td><td>Ludovic Courtès</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
* gnu/services/databases.scm (memcached-shepherd-service): Remove
‘with-imported-modules’ form and ‘modules’ field.
* gnu/services/security-token.scm (pcscd-shepherd-service): Remove
‘with-imported-modules’ form.
* gnu/services/web.scm (hpcguix-web-shepherd-service): Likewise.

Change-Id: Ieb817508f1751e0c1ff551a0e078789a4a813c1c


</td></tr>
<tr class='logheader'><td><span title='2022-06-25 01:43:08 +0530'>2022-06-25</span></td><td class='logsubject'><a href='/guix/commit/gnu/services/security-token.scm?id=037bfd85458dd0b32a6dd85b7c12e85e3dd716ae'>services: pcscd: Use switch-symlinks from (guix build utils).</a></td><td>Arun Isaac</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
switch-symlinks has been moved to (guix build utils). We need not duplicate it
anymore.

* gnu/services/security-token.scm (pcscd-activation): Use switch-symlinks
from (guix build utils).


</td></tr>
<tr class='logheader'><td><span title='2021-07-03 20:13:42 +0200'>2021-07-03</span></td><td class='logsubject'><a href='/guix/commit/gnu/services/security-token.scm?id=e789ce538ed848bacb8f4eb5742f78b965ccf57c'>services: pcscd: Fix daemon signal handling.</a></td><td>Brice Waegeneire</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
"pcscd" wouldn't handle SIGTERM as it inherit ignoring this signal (and
others) from its parent shepherd; fork+exec-command restore signal
handling.  Fixes &lt;https://issues.guix.gnu.org/45202&gt;.

* gnu/services/security-token.scm (pcscd)[start]: Use
fork+exec-command to start "pcscd".


</td></tr>
<tr class='logheader'><td><span title='2021-06-19 23:49:18 +0200'>2021-06-19</span></td><td class='logsubject'><a href='/guix/commit/gnu/services/security-token.scm?id=4bed8486d4c0a4ff142903b8bc1584ce84767355'>services: pcscd: Cleanup socket when started.</a></td><td>Brice Waegeneire</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
Otherwise when pcscd doesn't terminate properly (ie. receive a SIGKILL),
it won't start again because of it's socket already existing.

* gnu/services/security-token.scm (pcscd-shepherd-service)[start]:
Remove existing socket file.


</td></tr>