From c5fc6c6030d7d9d1b2af3d5165bebed3decd741b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Mon, 2 Oct 2017 06:51:13 +0200 Subject: New upstream version 0.9.4 --- raphodo/metadataphoto.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'raphodo/metadataphoto.py') diff --git a/raphodo/metadataphoto.py b/raphodo/metadataphoto.py index a9e2c3d..4989c60 100755 --- a/raphodo/metadataphoto.py +++ b/raphodo/metadataphoto.py @@ -158,8 +158,12 @@ class MetaData(GExiv2.Metadata): Returns missing if the metadata value is not present. """ try: - return self.get_tag_interpreted_string("Exif.Photo.ISOSpeedRatings") - except: + v = self.get_tag_interpreted_string("Exif.Photo.ISOSpeedRatings") + if v: + return v + else: + return missing + except Exception: return missing def exposure_time(self, alternativeFormat=False, missing=''): @@ -234,7 +238,7 @@ class MetaData(GExiv2.Metadata): """ try: return self.get_tag_string("Exif.Image.Make").strip() - except: + except Exception: return missing def camera_model(self, missing=''): @@ -245,7 +249,7 @@ class MetaData(GExiv2.Metadata): """ try: return self.get_tag_string("Exif.Image.Model").strip() - except: + except Exception: return missing def _fetch_vendor(self, vendor_codes, missing=''): -- cgit v1.2.3