[z3-checkins] r52891 - z3/deliverance/trunk/deliverance

[ianb at codespeak.net]

Author: ianb
Date: Tue Mar 25 01:21:47 2008
New Revision: 52891

Modified:
   z3/deliverance/trunk/deliverance/interpreter.py
Log:
Make xpath errors include the xpath expression that caused the error

Modified: z3/deliverance/trunk/deliverance/interpreter.py
==============================================================================
--- z3/deliverance/trunk/deliverance/interpreter.py	(original)
+++ z3/deliverance/trunk/deliverance/interpreter.py	Tue Mar 25 01:21:47 2008
@@ -153,8 +153,11 @@
         if theme_el is None:
             return 
 
-        content_els = copy.deepcopy(
-            content.xpath(self.get_content_xpath(rule)))
+        try:
+            xpath = content.xpath(self.get_content_xpath(rule))
+        except etree.XPathEvalError, e:
+            raise etree.XPathEvalError("Error %s in xpath expression %r" % (e, self.get_content_xpath(rule)))
+        content_els = copy.deepcopy(xpath)
 
         if len(content_els) == 0:
             if rule.get(self.NOCONTENT_KEY) != 'ignore':