ECHO_content/ECHO_helpers.py - diff

Return to ECHO_helpers.py CVS log

Up to [Repository] / ECHO_content

-version 1.16, 2004/08/18 12:41:00
+version 1.20, 2004/10/19 18:44:26
  Line 1
- import timeoutsocket
+ import socket
  import urllib
- timeoutsocket.setDefaultSocketTimeout(2)
- urlopener = urllib.URLopener()
  def urlopen(url):
      """urlopen mit timeout"""
-     try:
+     socket.setdefaulttimeout(2)
-         con = urlopener.open(url)
+     ret=urllib.urlopen(url)
-         return con
+     socket.setdefaulttimeout(5)
-     except timeoutsocket.Timeout:
+     return ret
-         return None
+ #   urlopener = urllib.URLopener()
+ #
+ #   try:
+ #       con = urlopener.open(url)
+ #       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_essay','ECHO_ZCatalogElement']
  def checkOnlyOneInGroup(object):