Updated version 0.9.4 from 'upstream/0.9.4'

with Debian dir 31043f20abb0a924130b658a2ff3b5cbcbf689d9

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=''):