changeset 3026:6275f8695bc8

image_jpeg: KeyError as exception for EXIF added (ported from 1.6)
author Reimar Bauer <rb.proj AT googlemail DOT com>
date Sun, 03 Feb 2008 17:51:52 +0100
parents ccf6d7ffb310
children 6dcc9617bab6
files MoinMoin/filter/image_jpeg.py
diffstat 1 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/filter/image_jpeg.py	Wed Jan 30 09:36:59 2008 +0100
+++ b/MoinMoin/filter/image_jpeg.py	Sun Feb 03 17:51:52 2008 +0100
@@ -23,8 +23,9 @@
         except:
             pass
         data = str(tags).decode('utf-8')
-    except (ValueError, TypeError): # EXIF throws ValueError on unknown tags
-                                    #             TypeError on other occassions
+    except (ValueError, TypeError, KeyError): # EXIF throws ValueError on unknown tags
+                                              # TypeError on other occassions
+                                              # KeyError too
         data = u''
     return data