summaryrefslogtreecommitdiff
path: root/raphodo/metadataphoto.py
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2017-10-02 06:51:13 +0200
committerJörg Frings-Fürst <debian@jff-webhosting.net>2017-10-02 06:51:13 +0200
commitc5fc6c6030d7d9d1b2af3d5165bebed3decd741b (patch)
treedfacccc9ae0747e53e53e5388b2ecd0623e040c3 /raphodo/metadataphoto.py
parent77dd64c0757c0191b276e65c24ee9874959790c8 (diff)
New upstream version 0.9.4upstream/0.9.4
Diffstat (limited to 'raphodo/metadataphoto.py')
-rwxr-xr-xraphodo/metadataphoto.py12
1 files changed, 8 insertions, 4 deletions
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=''):