Thread: [PyWebMail-Checkins] webmail/webmail/utils/xhttp utils.py, 1.4, 1.5 __init__.py, 1.24, 1.25
Status: Beta
Brought to you by:
dubnerm
From: Michael D. <du...@us...> - 2007-12-09 11:07:54
|
Update of /cvsroot/pywebmail/webmail/webmail/utils/xhttp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8401 Modified Files: utils.py __init__.py Log Message: changes in blocking processing Index: utils.py =================================================================== RCS file: /cvsroot/pywebmail/webmail/webmail/utils/xhttp/utils.py,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** utils.py 1 Dec 2007 02:25:45 -0000 1.4 --- utils.py 9 Dec 2007 11:07:51 -0000 1.5 *************** *** 15,18 **** --- 15,19 ---- truefp = infp while not hasattr(truefp, 'setblocking'): + log.debug('socket fp object:\ntype = %s\n__class__ = %s\nrepr = %s\ndir = %s', type(truefp), getattr(truefp, '__class__', None), repr(truefp), dir(truefp)) if hasattr(truefp, 'fp'): truefp = truefp.fp *************** *** 21,24 **** --- 22,26 ---- else: break + log.debug('last socket fp object:\ntype = %s\n__class__ = %s\nrepr = %s\ndir = %s', type(truefp), getattr(truefp, '__class__', None), repr(truefp), dir(truefp)) if not hasattr(truefp, 'setblocking'): log.warn('Switching to blocking retrieve - non-socket object') *************** *** 59,62 **** --- 61,65 ---- if reporthook: reporthook(blocknum, bs, size) + return blocking class HTTPNoRedirectHandler(urllib2.HTTPRedirectHandler): Index: __init__.py =================================================================== RCS file: /cvsroot/pywebmail/webmail/webmail/utils/xhttp/__init__.py,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** __init__.py 8 Dec 2007 08:00:15 -0000 1.24 --- __init__.py 9 Dec 2007 11:07:51 -0000 1.25 *************** *** 167,172 **** if headers.has_key('content-length'): size = int(headers['Content-Length']) ! _socketretrieve(fp, tfp, reporthook, size, blocking=blocking, read_timeout=read_timeout, log=log) fp.close() if fn: --- 167,173 ---- if headers.has_key('content-length'): size = int(headers['Content-Length']) ! blocking = _socketretrieve(fp, tfp, reporthook, size, blocking=blocking, read_timeout=read_timeout, log=log) + if blocking: parse_chunked = 0 # specific of httplib.HTTPResponse fp.close() if fn: |