add protection for unexpected EXIF info

richq · Sep 17, 2016 · 0b73505 · 0b73505
1 parent a88857e
commit 0b73505
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/f2flickr/uploadr.py b/f2flickr/uploadr.py
@@ -491,8 +491,11 @@ def uploadImage( self, image ):
                 if XPKEYWORDS in exiftags:
                     printable = exiftags[XPKEYWORDS].printable
                     if len(printable) > 4:
-                        exifstring = exifread.make_string(eval(printable))
-                        picTags += exifstring.replace(';', ' ')
+                        try:
+                            exifstring = exifread.make_string(eval(printable))
+                            picTags += exifstring.replace(';', ' ')
+                        except:
+                            logging.exception("Skipping unexpected EXIF data in %s", image)
 
             picTags = picTags.strip()
             logging.info("Uploading image %s with tags %s", image, picTags)
@@ -529,7 +532,7 @@ def uploadImage( self, image ):
             self.abandonUploads = True
             return None
         except:
-            logging.exception("Upload failed")
+            logging.exception("Upload failed %s", image)
         return None