Changeset 871
- Timestamp:
- 12/14/05 06:12:23
- Files:
-
- trunk/cherrypy/_cpserver.py (modified) (5 diffs)
- trunk/cherrypy/test/test_sessionauthenticate_filter.py (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/cherrypy/_cpserver.py
r856 r871 36 36 37 37 # Backward compatibility: 38 self.onStopServerList = self.on_stop_server_list39 self.onStartThreadList = self.on_start_thread_list40 self.onStartServerList = self.on_start_server_list41 self.onStopThreadList = self.on_stop_thread_list38 self.onStopServerList = [] 39 self.onStartThreadList = [] 40 self.onStartServerList = [] 41 self.onStopThreadList = [] 42 42 43 43 def start(self, initOnly=False, serverClass=_missing): … … 94 94 configure() 95 95 96 for func in cherrypy.server.on_start_server_list :96 for func in cherrypy.server.on_start_server_list + cherrypy.server.onStartServerList: 97 97 func() 98 98 self.start_http_server() … … 187 187 seen_threads[threadID] = i 188 188 189 for func in self.on_start_thread_list :189 for func in self.on_start_thread_list + self.onStartThreadList: 190 190 func(i) 191 191 … … 201 201 202 202 for thread_ident, i in seen_threads.iteritems(): 203 for func in self.on_stop_thread_list :203 for func in self.on_stop_thread_list + self.onStopThreadList: 204 204 func(i) 205 205 seen_threads.clear() 206 206 207 for func in self.on_stop_server_list :207 for func in self.on_stop_server_list + self.onStopServerList: 208 208 func() 209 209 … … 227 227 """Restart, including any HTTP servers.""" 228 228 self.stop() 229 for func in self.on_start_server_list :229 for func in self.on_start_server_list + self.onStartServerList: 230 230 func() 231 231 self.start_http_server() trunk/cherrypy/test/test_sessionauthenticate_filter.py
r856 r871 29 29 # request a page and check for login form 30 30 self.getPage('/') 31 self.assertInBody('<form method="post" action="do Login">')31 self.assertInBody('<form method="post" action="do_login">') 32 32 33 33 # setup credentials 34 login_body = 'login=login&password=password&from Page=/'34 login_body = 'login=login&password=password&from_page=/' 35 35 36 36 # attempt a login 37 self.getPage('/do Login', method='POST', body=login_body)37 self.getPage('/do_login', method='POST', body=login_body) 38 38 if protocol == 'HTTP/1.0': 39 39 self.assertStatus('302 Found') … … 46 46 47 47 # do a logout 48 self.getPage('/do Logout', self.cookies)48 self.getPage('/do_logout', self.cookies) 49 49 if protocol == 'HTTP/1.0': 50 50 self.assertStatus('302 Found') … … 54 54 # verify we are logged out 55 55 self.getPage('/', self.cookies) 56 self.assertInBody('<form method="post" action="do Login">')56 self.assertInBody('<form method="post" action="do_login">') 57 57 58 58

