Download Install Tutorial Docs FAQ Tools WikiLicense Team IRC Planet Involvement Shop Book

Changeset 1284

Show
Ignore:
Timestamp:
08/26/06 14:09:18
Author:
fumanchu
Message:

A couple fixes to CP3's _cpwsgiserver.py for Python 2.3 compatibility.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/cherrypy/_cpwsgiserver.py

    r1283 r1284  
    206206        environ["CONTENT_LENGTH"] = headers.getheader("Content-length") or "" 
    207207         
    208         for k in headers: 
     208        # Must use keys() here for Python 2.3 (rfc822.Message had no __iter__). 
     209        for k in headers.keys(): 
    209210            envname = "HTTP_" + k.upper().replace("-", "_") 
    210211            if k in comma_separated_headers: 
     
    380381                if req: 
    381382                    req.simple_response("500 Internal Server Error", 
    382                                         traceback.format_exc()) 
     383                                        format_exc()) 
    383384        except (KeyboardInterrupt, SystemExit): 
    384385            raise 
    385386        except: 
    386387            if req: 
    387                 req.simple_response("500 Internal Server Error", 
    388                                     traceback.format_exc()) 
     388                req.simple_response("500 Internal Server Error", format_exc()) 
    389389     
    390390    def close(self): 
     
    392392        self.wfile.close() 
    393393        self.socket.close() 
     394 
     395 
     396def format_exc(limit=None): 
     397    """Like print_exc() but return a string. Backport for Python 2.3.""" 
     398    try: 
     399        etype, value, tb = sys.exc_info() 
     400        return ''.join(traceback.format_exception(etype, value, tb, limit)) 
     401    finally: 
     402        etype = value = tb = None 
    394403 
    395404 

Hosted by WebFaction

Log in as guest/cpguest to create tickets