--- documentViewer/documentViewer.py 2010/06/16 18:27:04 1.69.2.3 +++ documentViewer/documentViewer.py 2010/06/16 18:46:29 1.69.2.9 @@ -2,32 +2,19 @@ from OFS.Folder import Folder from Products.PageTemplates.ZopePageTemplate import ZopePageTemplate from Products.PageTemplates.PageTemplateFile import PageTemplateFile -from Products.PythonScripts.standard import url_quote from AccessControl import ClassSecurityInfo from AccessControl import getSecurityManager from Globals import package_home -from Ft.Xml.Domlette import NonvalidatingReader -from Ft.Xml.Domlette import PrettyPrint, Print from Ft.Xml import EMPTY_NAMESPACE, Parse - -from xml.dom.minidom import parse, parseString - -from extraFunction import * - - -import Ft.Xml.XPath -import cStringIO -import xmlrpclib import os.path import sys -import cgi import urllib +import urllib2 import logging import math - import urlparse -from types import * +import cStringIO def logger(txt,method,txt2): """logging""" @@ -84,7 +71,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))