Changeset 307
- Timestamp:
- 06/14/05 03:05:03
- Files:
-
- branches/ooconf/cherrypy/_cpdefaults.py (modified) (2 diffs)
- branches/ooconf/cherrypy/_cphttpserver.py (modified) (1 diff)
- branches/ooconf/cherrypy/_cphttptools.py (modified) (2 diffs)
- branches/ooconf/cherrypy/lib/filter/logdebuginfofilter.py (modified) (1 diff)
- branches/ooconf/cherrypy/lib/filter/tidyfilter.py (modified) (1 diff)
- branches/ooconf/cherrypy/test/test_combinedfilters.py (modified) (1 diff)
- branches/ooconf/cherrypy/test/test_gzip_filter.py (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
branches/ooconf/cherrypy/_cpdefaults.py
r301 r307 33 33 34 34 import time, thread, os 35 try: 36 import cStringIO as StringIO 37 except ImportError: 38 import StringIO 35 39 import cPickle as pickle 36 40 import cpg … … 64 68 """ Default _cpOnError method """ 65 69 66 import traceback , StringIO70 import traceback 67 71 bodyFile = StringIO.StringIO() 68 72 traceback.print_exc(file = bodyFile) branches/ooconf/cherrypy/_cphttpserver.py
r277 r307 29 29 import threading, SocketServer, BaseHTTPServer, socket, Queue 30 30 import cpg, _cpserver, _cputil, _cphttptools 31 32 try:33 import cStringIO as StringIO34 except ImportError:35 import StringIO36 31 37 32 branches/ooconf/cherrypy/_cphttptools.py
r306 r307 31 31 """ 32 32 33 import urllib, sys, time, traceback, types, StringIO,cgi33 import urllib, sys, time, traceback, types, cgi 34 34 import mimetypes, Cookie, urlparse 35 35 import cpg, _cputil, cperror, _cpdefaults 36 37 try: 38 import cStringIO as StringIO 39 except ImportError: 40 import StringIO 36 41 37 42 from BaseHTTPServer import BaseHTTPRequestHandler … … 102 107 try: 103 108 applyFilters('onStartResource') 104 try: 105 main, virtualPathList = self.findMain() 106 107 # Look up again, since cpg.request.settings is now set 108 collectFilters(True) 109 110 applyFilters('beforeRequestBody') 111 if cpg.request.processRequestBody: 112 self.processRequestBody() 113 114 applyFilters('beforeMain') 115 if cpg.response.body is None: 116 body = main(*(virtualPathList + cpg.request.paramList), 117 **(cpg.request.paramMap)) 118 cpg.response.body = iterable(body) 119 120 applyFilters('beforeFinalize') 121 finalize() 122 except cperror.RequestHandled: 123 pass 109 main, virtualPathList = self.findMain() 110 111 # Look up again, since cpg.request.settings is now present 112 collectFilters(True) 113 114 applyFilters('beforeRequestBody') 115 if cpg.request.processRequestBody: 116 self.processRequestBody() 117 118 applyFilters('beforeMain') 119 if cpg.response.body is None: 120 body = main(*(virtualPathList + cpg.request.paramList), 121 **(cpg.request.paramMap)) 122 cpg.response.body = iterable(body) 123 124 applyFilters('beforeFinalize') 125 finalize() 124 126 finally: 125 127 applyFilters('onEndResource') 128 except cperror.RequestHandled: 129 pass 126 130 except: 127 131 handleError(sys.exc_info()) branches/ooconf/cherrypy/lib/filter/logdebuginfofilter.py
r306 r307 27 27 """ 28 28 29 import time, StringIO, pickle 29 import time, pickle 30 31 try: 32 import cStringIO as StringIO 33 except ImportError: 34 import StringIO 35 30 36 31 37 class LogDebugInfoFilter: branches/ooconf/cherrypy/lib/filter/tidyfilter.py
r306 r307 27 27 """ 28 28 29 import os, cgi, StringIO, traceback 29 import os, cgi, traceback 30 31 try: 32 import cStringIO as StringIO 33 except ImportError: 34 import StringIO 35 30 36 31 37 class TidyFilter: branches/ooconf/cherrypy/test/test_combinedfilters.py
r305 r307 27 27 """ 28 28 29 import gzip, StringIO 29 import gzip 30 31 try: 32 import cStringIO as StringIO 33 except ImportError: 34 import StringIO 35 30 36 from cherrypy import cpg 31 37 branches/ooconf/cherrypy/test/test_gzip_filter.py
r301 r307 27 27 """ 28 28 29 import gzip, StringIO 29 import gzip 30 31 try: 32 import cStringIO as StringIO 33 except ImportError: 34 import StringIO 35 30 36 from cherrypy import cpg 31 37
