--- documentViewer/documentViewer.py 2010/06/16 18:35:59 1.69.2.5 +++ documentViewer/documentViewer.py 2010/06/16 18:48:34 1.69.2.10 @@ -7,15 +7,15 @@ from AccessControl import getSecurityMan from Globals import package_home from Ft.Xml import EMPTY_NAMESPACE, Parse +from Ft.Xml.Domlette import PrettyPrint, Print import os.path import sys import urllib import urllib2 import logging import math - import urlparse -from types import * +import cStringIO def logger(txt,method,txt2): """logging""" @@ -72,7 +72,7 @@ def getHttpData(url, data=None, num_trie if sys.version_info < (2, 6): # set timeout on socket -- ugly :-( import socket - socket.setdefaulttimeout(timeout) + socket.setdefaulttimeout(float(timeout)) response = urllib2.urlopen(url) else: response = urllib2.urlopen(url,timeout=float(timeout))