changeset 500:b3c18ea7db7d

avoid indexing to crash because of EXIF TypeErrors imported from: moin--main--1.5--patch-504
author Thomas Waldmann <tw@waldmann-edv.de>
date Sun, 26 Mar 2006 10:01:15 +0000
parents a65a53daed80
children 069acf15d7b3
files ChangeLog MoinMoin/filter/image_jpeg.py
diffstat 2 files changed, 16 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Sun Mar 26 09:57:07 2006 +0000
+++ b/ChangeLog	Sun Mar 26 10:01:15 2006 +0000
@@ -2,6 +2,20 @@
 # arch-tag: automatic-ChangeLog--arch@arch.thinkmo.de--2003-archives/moin--main--1.5
 #
 
+2006-03-26 11:01:15 GMT	Thomas Waldmann <tw@waldmann-edv.de>	patch-504
+
+    Summary:
+      avoid indexing to crash because of EXIF TypeErrors
+    Revision:
+      moin--main--1.5--patch-504
+
+    avoid indexing to crash because of EXIF TypeErrors
+    
+
+    modified files:
+     ChangeLog MoinMoin/filter/image_jpeg.py
+
+
 2006-03-26 10:57:07 GMT	Thomas Waldmann <tw@waldmann-edv.de>	patch-503
 
     Summary:
--- a/MoinMoin/filter/image_jpeg.py	Sun Mar 26 09:57:07 2006 +0000
+++ b/MoinMoin/filter/image_jpeg.py	Sun Mar 26 10:01:15 2006 +0000
@@ -23,7 +23,8 @@
         except:
             pass
         data = str(tags).decode('utf-8')
-    except ValueError, err: # EXIF throws ValueError on unknown tags
+    except (ValueError, TypeError), err: # EXIF throws ValueError on unknown tags
+                                         #             TypeError on other occassions
         data = u''
     return data