From: Laurence R. <svn...@pl...> - 2009-06-04 21:38:36
|
Author: ldr Date: Thu Jun 4 21:38:28 2009 New Revision: 27308 Modified: Products.PloneOrg/trunk/Products/PloneOrg/Extensions/html_validity.py Log: show remote error Modified: Products.PloneOrg/trunk/Products/PloneOrg/Extensions/html_validity.py ============================================================================== --- Products.PloneOrg/trunk/Products/PloneOrg/Extensions/html_validity.py (original) +++ Products.PloneOrg/trunk/Products/PloneOrg/Extensions/html_validity.py Thu Jun 4 21:38:28 2009 @@ -4,7 +4,7 @@ """ from lxml import etree -from urllib2 import urlopen, Request +from urllib2 import urlopen, Request, HTTPError import urlparse def html_validity(self, url): @@ -13,13 +13,18 @@ path, qs = urlparse.urlsplit(url)[2:4] if qs: path += '?' + qs - plone_path = request['PATH_INFO'].split('VirtualHostRoot')[0] + #plone_path = request['PATH_INFO'].split('VirtualHostRoot')[0] + plone_path = 'VirtualHostBase/http/plone.org:80/plone.org/' plone_url = 'http://%s/%sVirtualHostRoot%s' % (request['HTTP_HOST'], plone_path, path) + request.environ['debug_plone_url'] = plone_url new_req = Request(plone_url) cookie = request.environ.get('HTTP_COOKIE', None) if cookie is not None: new_req.add_header('Cookie', cookie) - response = urlopen(new_req) + try: + response = urlopen(new_req) + except HTTPError, e: + return 'Error opening url.\n%s' % e data = response.read() header_len = len('HTTP/1.0 200 OK\r\n') + len(''.join(response.headers.headers)) + len('\r\n') |