Diff for /documentViewer/documentViewer.py between versions 1.69.2.5 and 1.69.2.10

version 1.69.2.5, 2010/06/16 18:35:59 version 1.69.2.10, 2010/06/16 18:48:34
Line 7  from AccessControl import getSecurityMan Line 7  from AccessControl import getSecurityMan
 from Globals import package_home  from Globals import package_home
   
 from Ft.Xml import EMPTY_NAMESPACE, Parse  from Ft.Xml import EMPTY_NAMESPACE, Parse
   from Ft.Xml.Domlette import PrettyPrint, Print
 import os.path  import os.path
 import sys  import sys
 import urllib  import urllib
 import urllib2  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 72  def getHttpData(url, data=None, num_trie Line 72  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.5  
changed lines
  Added in v.1.69.2.10


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