changeset 5042:9cf89f52e251

Automated merge with http://hg.moinmo.in/moin/1.9
author Dmitrijs Milajevs <dimazest@gmail.com>
date Thu, 27 Aug 2009 14:57:09 +0200
parents 23654939130a (diff) 1f502319f76b (current diff)
children d50ca8a73057
files MoinMoin/search/Xapian.py MoinMoin/search/queryparser.py MoinMoin/support/xapwrap/__init__.py MoinMoin/support/xapwrap/document.py MoinMoin/support/xapwrap/index.py
diffstat 2 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/filter/application_vnd_oasis_opendocument.py	Tue Aug 25 22:30:33 2009 +0200
+++ b/MoinMoin/filter/application_vnd_oasis_opendocument.py	Thu Aug 27 14:57:09 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 22:30:33 2009 +0200
+++ b/MoinMoin/filter/application_vnd_sun_xml.py	Thu Aug 27 14:57:09 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')