[z3-checkins] r40541 - z3/deliverance/zdeliverance

[ianb at codespeak.net]

Author: ianb
Date: Thu Mar 15 16:35:52 2007
New Revision: 40541

Modified:
   z3/deliverance/zdeliverance/traversal.py
Log:
Fix some bugs found during interactive test

Modified: z3/deliverance/zdeliverance/traversal.py
==============================================================================
--- z3/deliverance/zdeliverance/traversal.py	(original)
+++ z3/deliverance/zdeliverance/traversal.py	Thu Mar 15 16:35:52 2007
@@ -15,7 +15,7 @@
     is traversed """
 
     meta_type = 'Deliverance Rule'
-    theme_url = ''
+    theme_uri = ''
     rule = ''
     id = 'deliverance_rule'
 
@@ -42,7 +42,8 @@
         def setBody(*arg, **kw):
             orig_setBody(*arg, **kw)
             # Should also stop if deliverance.theme doesn't match up to self
-            if not response.headers['content-type'].startswith('text/html'):
+            if (not response.headers.get('content-type', '').startswith('text/html')
+                or not self.rule):
                 return response
             body = self.transform_body(response)
             return orig_setBody(body)
@@ -90,7 +91,7 @@
         f = urllib.urlopen(href)
         c = f.read()
         f.close()
-        return f
+        return c
             
 def manage_addDeliveranceRule(self, REQUEST=None):
     """ Add a deliverance rule """