From f819f883d461a7022b7df0c57cc17ec238a5ed85 Mon Sep 17 00:00:00 2001 From: Simon Conseil Date: Fri, 8 Jan 2016 00:13:07 +0100 Subject: [PATCH] Fix test with fraction exposure --- sigal/image.py | 3 ++- tests/test_image.py | 5 ++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/sigal/image.py b/sigal/image.py index 777e271..d46ca71 100644 --- a/sigal/image.py +++ b/sigal/image.py @@ -255,7 +255,8 @@ def get_exif_tags(data): exptime = data['ExposureTime'] if isinstance(exptime, tuple): try: - simple['exposure'] = str(fractions.Fraction(exptime[0], exptime[1])) + simple['exposure'] = str(fractions.Fraction(exptime[0], + exptime[1])) except IndexError: # Pillow == 3.0 simple['exposure'] = exptime[0] diff --git a/tests/test_image.py b/tests/test_image.py index 0faa62b..df0cedc 100644 --- a/tests/test_image.py +++ b/tests/test_image.py @@ -105,7 +105,10 @@ def test_get_exif_tags(): assert simple['iso'] == 50 assert simple['Make'] == 'NIKON' assert simple['datetime'] == 'Sunday, 22. January 2006' - assert simple['exposure'] == 0.00100603 + if PIL.PILLOW_VERSION == '3.0.0': + assert simple['exposure'] == 0.00100603 + else: + assert simple['exposure'] == '100603/100000000' data = {'FNumber': [1, 0], 'FocalLength': [1, 0], 'ExposureTime': 10} simple = get_exif_tags(data)