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

Diff for /MPIWGWeb/Attic/SrvTxtUtils.py between versions 1.1.2.1 and 1.1.2.2

version 1.1.2.1, 2012/03/22 13:30:56 version 1.1.2.2, 2012/03/23 15:27:05
Line 11  import urllib2 Line 11  import urllib2
 import logging  import logging
   
   
 srvTxtUtilsVersion = "1.3"  srvTxtUtilsVersion = "1.5"
   
 def getInt(number, default=0):  def getInt(number, default=0):
     """returns always an int (0 in case of problems)"""      """returns always an int (0 in case of problems)"""
Line 27  def getAt(array, idx, default=None): Line 27  def getAt(array, idx, default=None):
     except:      except:
         return default          return default
   
   def unicodify(s):
       """decode str (utf-8 or latin-1 representation) into unicode object"""
       if not s:
           return u""
       if isinstance(s, str):
           try:
               return s.decode('utf-8')
           except:
               return s.decode('latin-1')
       else:
           return s
   
   def utf8ify(s):
       """encode unicode object or string into byte string in utf-8 representation.
          assumes string objects to be utf-8"""
       if not s:
           return ""
       if isinstance(s, str):
           return s
       else:
           return s.encode('utf-8')
   
 def getText(node, recursive=0):  def getText(node, recursive=0):
     """returns all text content of a node and its subnodes"""      """returns all text content of a node and its subnodes"""
     if node is None:      if node is None:
Line 53  def getText(node, recursive=0): Line 75  def getText(node, recursive=0):
   
   
   
 def getHttpData(url, data=None, num_tries=3, timeout=10):  def getHttpData(url, data=None, num_tries=3, timeout=10, noExceptions=False):
     """returns result from url+data HTTP request"""      """returns result from url+data HTTP request"""
     # we do GET (by appending data to url)      # we do GET (by appending data to url)
     if isinstance(data, str) or isinstance(data, unicode):      if isinstance(data, str) or isinstance(data, unicode):
Line 94  def getHttpData(url, data=None, num_trie Line 116  def getHttpData(url, data=None, num_trie
         response.close()          response.close()
         return data          return data
           
       if noExceptions:
           return None
       
     raise IOError("ERROR fetching HTTP data from %s: %s"%(url,errmsg))      raise IOError("ERROR fetching HTTP data from %s: %s"%(url,errmsg))
     #return None      #return None
   
Removed from v.1.1.2.1  
changed lines
  Added in v.1.1.2.2

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