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

Changeset 1948

Show
Ignore:
Timestamp:
04/26/08 17:47:54
Author:
fumanchu
Message:

Doc tweaks and a missing 'rb'.

Files:

Legend:

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

    r1938 r1948  
    6262     
    6363    def access(self): 
    64         """Write to the access log.""" 
     64        """Write to the access log (in Apache/NCSA Combined Log format).""" 
    6565        request = cherrypy.request 
    6666        inheaders = request.headers 
  • trunk/cherrypy/wsgiserver/__init__.py

    r1937 r1948  
    10581058 
    10591059class ThreadPool(object): 
    1060     """A Request Queue for the CherryPyWSGIServer which pools threads.""" 
     1060    """A Request Queue for the CherryPyWSGIServer which pools threads. 
     1061     
     1062    ThreadPool objects must provide min, get(), put(obj), start() 
     1063    and stop(timeout) attributes. 
     1064    """ 
    10611065     
    10621066    def __init__(self, server, min=10, max=-1): 
     
    14881492    def populate_ssl_environ(self): 
    14891493        """Create WSGI environ entries to be merged into each request.""" 
    1490         cert = open(self.ssl_certificate).read() 
     1494        cert = open(self.ssl_certificate, 'rb').read() 
    14911495        cert = crypto.load_certificate(crypto.FILETYPE_PEM, cert) 
    14921496        ssl_environ = { 

Hosted by WebFaction

Log in as guest/cpguest to create tickets