Changeset 1284
- Timestamp:
- 08/26/06 14:09:18
- Files:
-
- trunk/cherrypy/_cpwsgiserver.py (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/cherrypy/_cpwsgiserver.py
r1283 r1284 206 206 environ["CONTENT_LENGTH"] = headers.getheader("Content-length") or "" 207 207 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(): 209 210 envname = "HTTP_" + k.upper().replace("-", "_") 210 211 if k in comma_separated_headers: … … 380 381 if req: 381 382 req.simple_response("500 Internal Server Error", 382 traceback.format_exc())383 format_exc()) 383 384 except (KeyboardInterrupt, SystemExit): 384 385 raise 385 386 except: 386 387 if req: 387 req.simple_response("500 Internal Server Error", 388 traceback.format_exc()) 388 req.simple_response("500 Internal Server Error", format_exc()) 389 389 390 390 def close(self): … … 392 392 self.wfile.close() 393 393 self.socket.close() 394 395 396 def 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 394 403 395 404

