Changeset 3659

Timestamp:

09/11/08 17:44:43 (2 months ago)

Author:

dmeyer

Message:

handle strange Canon SLR EXIF data

Files:

• trunk/metadata/src/core.py (modified) (1 diff)

trunk/metadata/src/core.py

@@ -137 +137 @@
                         value = unicode(value)
                         if len(value) > 50:
-                            value = '<unprintable data, size=%d>' % len(value)
-                    except UnicodeDecodeError:
-                        value = '<unprintable data, size=%d>' % len(value)
-                    result += u'|    | %s: %s\n' % (unicode(key), unicode(value))
+                            value = u'<unprintable data, size=%d>' % len(value)
+                    except (UnicodeDecodeError, TypeError), e:
+                        try:
+                            value = u'<unprintable data, size=%d>' % len(value)
+                        except AttributeError:
+                            value = u'<unprintable data>'
+                    result += u'|    | %s: %s\n' % (unicode(key), value)
         return result