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

[ianb at codespeak.net]

Author: ianb
Date: Thu Mar 15 17:41:52 2007
New Revision: 40549

Modified:
   z3/deliverance/zdeliverance/traversal.py
Log:
use urllib2 instead of urllib; set Accept: html

Modified: z3/deliverance/zdeliverance/traversal.py
==============================================================================
--- z3/deliverance/zdeliverance/traversal.py	(original)
+++ z3/deliverance/zdeliverance/traversal.py	Thu Mar 15 17:41:52 2007
@@ -8,7 +8,7 @@
 from deliverance.interpreter import Renderer
 from deliverance import htmlserialize
 from lxml import etree
-import urllib
+import urllib2
 import re
 
 class DeliveranceRule(SimpleItem, PropertyManager):
@@ -108,7 +108,11 @@
         if href.startswith('data:'):
             return href[5:]
         # @@: This is a really bad implementation
-        f = urllib.urlopen(href)
+        req = urllib2.Request(
+            href, headers={
+            'Accept': 'text/html,application/xhtml+xml'},
+            unverifiable=True)
+        f = urllib2.urlopen(req)
         c = f.read()
         match = self._meta_charset_re.search(c)
         if match: