[BACK]Return to documentViewer.py CVS log [TXT] [DIR] Up to [Repository] / documentViewer

Diff for /documentViewer/documentViewer.py between versions 1.69.2.4 and 1.69.2.9

version 1.69.2.4, 2010/06/16 18:32:20 version 1.69.2.9, 2010/06/16 18:46:29
Line 2 Line 2
 from OFS.Folder import Folder  from OFS.Folder import Folder
 from Products.PageTemplates.ZopePageTemplate import ZopePageTemplate  from Products.PageTemplates.ZopePageTemplate import ZopePageTemplate
 from Products.PageTemplates.PageTemplateFile import PageTemplateFile   from Products.PageTemplates.PageTemplateFile import PageTemplateFile 
 from Products.PythonScripts.standard import url_quote  
 from AccessControl import ClassSecurityInfo  from AccessControl import ClassSecurityInfo
 from AccessControl import getSecurityManager  from AccessControl import getSecurityManager
 from Globals import package_home  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 Ft.Xml import EMPTY_NAMESPACE, Parse
 import Ft.Xml.XPath  
 import cStringIO  
 import xmlrpclib  
 import os.path  import os.path
 import sys  import sys
 import cgi  
 import urllib  import urllib
   import urllib2
 import logging  import logging
 import math  import math
   
 import urlparse   import urlparse 
 from types import *  import cStringIO
   
 def logger(txt,method,txt2):  def logger(txt,method,txt2):
     """logging"""      """logging"""
Line 78  def getHttpData(url, data=None, num_trie Line 71  def getHttpData(url, data=None, num_trie
             if sys.version_info < (2, 6):              if sys.version_info < (2, 6):
                 # set timeout on socket -- ugly :-(                  # set timeout on socket -- ugly :-(
                 import socket                  import socket
                 socket.setdefaulttimeout(timeout)                  socket.setdefaulttimeout(float(timeout))
                 response = urllib2.urlopen(url)                  response = urllib2.urlopen(url)
             else:              else:
                 response = urllib2.urlopen(url,timeout=float(timeout))                  response = urllib2.urlopen(url,timeout=float(timeout))
Removed from v.1.69.2.4  
changed lines
  Added in v.1.69.2.9

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>