Diff for /ECHO_content/ECHO_helpers.py between versions 1.15 and 1.17

version 1.15, 2004/08/17 15:22:14 version 1.17, 2004/08/19 20:28:18
Line 1 Line 1
 import timeoutsocket  import socket
 import urllib  import urllib
   
 def urlopen(url):  def urlopen(url):
     """urlopen mit timeout"""      """urlopen mit timeout"""
     timeoutsocket.setDefaultSocketTimeout(1)      socket.setdefaulttimeout(2)
     urlopener = urllib.URLopener()      return urllib.urlopen(url)
     try:  #   urlopener = urllib.URLopener()
         con = urlopener.open(url)  #
         return con  #   try:        
     except timeoutsocket.Timeout:  #       con = urlopener.open(url)
         return None  #       return con
   #   except timeoutsocket.Timeout:
   #       return None
   
   
 displayTypes = ['ZSQLExtendFolder','ZSQLBibliography','ECHO_group','ECHO_collection','ECHO_resource','ECHO_link','ECHO_sqlElement','ECHO_pageTemplate','ImageCollectionIFrame','VLP_resource','VLP_collection','VLP_essay','ECHO_ZCatalogElement']  displayTypes = ['ZSQLExtendFolder','ZSQLBibliography','ECHO_group','ECHO_collection','ECHO_resource','ECHO_link','ECHO_sqlElement','ECHO_pageTemplate','ImageCollectionIFrame','VLP_resource','VLP_collection','VLP_essay','ECHO_ZCatalogElement']

Removed from v.1.15  
changed lines
  Added in v.1.17


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