@@ -37,27 +37,28 @@ def __init__(self, home, debug=False, timing=False, lang=None):
3737 def __call__ (self , environ , start_response ):
3838 """Initialize with `apache.Request` object"""
3939 self .environ = environ
40- self .__start_response = start_response
40+ request = RequestDispatcher (self .home , self .debug , self .timing )
41+ request .__start_response = start_response
4142
42- self .wfile = Writer (self )
43- self .__wfile = None
43+ request .wfile = Writer (request )
44+ request .__wfile = None
4445
4546 tracker = roundup .instance .open (self .home , not self .debug )
4647
4748 # need to strip the leading '/'
4849 environ ["PATH_INFO" ] = environ ["PATH_INFO" ][1 :]
49- if self .timing :
50- environ ["CGI_SHOW_TIMING" ] = self .timing
50+ if request .timing :
51+ environ ["CGI_SHOW_TIMING" ] = request .timing
5152
5253 form = cgi .FieldStorage (fp = environ ['wsgi.input' ], environ = environ )
5354
54- client = tracker .Client (tracker , self , environ , form ,
55- self .translator )
55+ client = tracker .Client (tracker , request , environ , form ,
56+ request .translator )
5657 try :
5758 client .main ()
5859 except roundup .cgi .client .NotFound :
59- self .start_response ([('Content-Type' , 'text/html' )], 404 )
60- self .wfile .write ('Not found: %s' % client .path )
60+ request .start_response ([('Content-Type' , 'text/html' )], 404 )
61+ request .wfile .write ('Not found: %s' % client .path )
6162
6263 # all body data has been written using wfile
6364 return []
0 commit comments