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

Changeset 871

Show
Ignore:
Timestamp:
12/14/05 06:12:23
Author:
rdelon
Message:

Better backward compatibility with pre-PEP8 conversion

Files:

Legend:

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

    r856 r871  
    3636 
    3737        # Backward compatibility: 
    38         self.onStopServerList = self.on_stop_server_list 
    39         self.onStartThreadList = self.on_start_thread_list 
    40         self.onStartServerList = self.on_start_server_list 
    41         self.onStopThreadList = self.on_stop_thread_list 
     38        self.onStopServerList = [] 
     39        self.onStartThreadList = [] 
     40        self.onStartServerList = [] 
     41        self.onStopThreadList = [] 
    4242     
    4343    def start(self, initOnly=False, serverClass=_missing): 
     
    9494            configure() 
    9595             
    96             for func in cherrypy.server.on_start_server_list
     96            for func in cherrypy.server.on_start_server_list + cherrypy.server.onStartServerList
    9797                func() 
    9898            self.start_http_server() 
     
    187187            seen_threads[threadID] = i 
    188188             
    189             for func in self.on_start_thread_list
     189            for func in self.on_start_thread_list + self.onStartThreadList
    190190                func(i) 
    191191         
     
    201201         
    202202        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
    204204                func(i) 
    205205        seen_threads.clear() 
    206206         
    207         for func in self.on_stop_server_list
     207        for func in self.on_stop_server_list + self.onStopServerList
    208208            func() 
    209209         
     
    227227        """Restart, including any HTTP servers.""" 
    228228        self.stop() 
    229         for func in self.on_start_server_list
     229        for func in self.on_start_server_list + self.onStartServerList
    230230            func() 
    231231        self.start_http_server() 
  • trunk/cherrypy/test/test_sessionauthenticate_filter.py

    r856 r871  
    2929        # request a page and check for login form 
    3030        self.getPage('/') 
    31         self.assertInBody('<form method="post" action="doLogin">') 
     31        self.assertInBody('<form method="post" action="do_login">') 
    3232 
    3333        # setup credentials         
    34         login_body = 'login=login&password=password&fromPage=/' 
     34        login_body = 'login=login&password=password&from_page=/' 
    3535 
    3636        # attempt a login 
    37         self.getPage('/doLogin', method='POST', body=login_body) 
     37        self.getPage('/do_login', method='POST', body=login_body) 
    3838        if protocol == 'HTTP/1.0': 
    3939            self.assertStatus('302 Found') 
     
    4646 
    4747        # do a logout 
    48         self.getPage('/doLogout', self.cookies) 
     48        self.getPage('/do_logout', self.cookies) 
    4949        if protocol == 'HTTP/1.0': 
    5050            self.assertStatus('302 Found') 
     
    5454        # verify we are logged out 
    5555        self.getPage('/', self.cookies) 
    56         self.assertInBody('<form method="post" action="doLogin">') 
     56        self.assertInBody('<form method="post" action="do_login">') 
    5757         
    5858         

Hosted by WebFaction

Log in as guest/cpguest to create tickets