changeset 4966:23654939130a

merged moin/1.8
author Thomas Waldmann <tw AT waldmann-edv DOT de>
date Wed, 26 Aug 2009 14:01:17 +0200
parents 8a97bb0caafb (current diff) ae8bf4c7d5a1 (diff)
children 6035cb0345db 9cf89f52e251
files
diffstat 2 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/filter/application_vnd_oasis_opendocument.py	Tue Aug 25 19:26:10 2009 +0200
+++ b/MoinMoin/filter/application_vnd_oasis_opendocument.py	Wed Aug 26 14:01:17 2009 +0200
@@ -21,8 +21,8 @@
         data = zf.read("content.xml")
         zf.close()
         data = " ".join(rx_stripxml.sub(" ", data).split())
-    except RuntimeError, err:
-        logging.error(str(err))
+    except (zipfile.BadZipfile, RuntimeError), err:
+        logging.error("%s [%s]" % (str(err), filename))
         data = ""
     return data.decode('utf-8')
 
--- a/MoinMoin/filter/application_vnd_sun_xml.py	Tue Aug 25 19:26:10 2009 +0200
+++ b/MoinMoin/filter/application_vnd_sun_xml.py	Wed Aug 26 14:01:17 2009 +0200
@@ -21,8 +21,8 @@
         data = zf.read("content.xml")
         zf.close()
         data = " ".join(rx_stripxml.sub(" ", data).split())
-    except RuntimeError, err:
-        logging.error(str(err))
+    except (zipfile.BadZipfile, RuntimeError), err:
+        logging.error("%s [%s]" % (str(err), filename))
         data = ""
     return data.decode('utf-8')