- upgrade cherrypy to version 3.6.0

- dont't pass unicode hostname to cherrypy (see cherrypy-issue #1285,
https://bitbucket.org/cherrypy/cherrypy/issue/1285/n-must-be-a-native-str-got-unicode)

lib/cherrypy/_cpserver.py

@@ -12,6 +12,7 @@ from cherrypy.process.servers import *
 
 
 class Server(ServerAdapter):
+
     """An adapter for an HTTP server.
 
     You can set attributes (like socket_host and socket_port)
@@ -26,15 +27,19 @@ class Server(ServerAdapter):
     """The TCP port on which to listen for connections."""
 
     _socket_host = '127.0.0.1'
+
     def _get_socket_host(self):
         return self._socket_host
+
     def _set_socket_host(self, value):
         if value == '':
             raise ValueError("The empty string ('') is not an allowed value. "
                              "Use '0.0.0.0' instead to listen on all active "
                              "interfaces (INADDR_ANY).")
         self._socket_host = value
-    socket_host = property(_get_socket_host, _set_socket_host,
+    socket_host = property(
+        _get_socket_host,
+        _set_socket_host,
         doc="""The hostname or IP address on which to listen for connections.
 
         Host values may be any IPv4 or IPv6 address, or any valid hostname.
@@ -56,6 +61,14 @@ class Server(ServerAdapter):
 
     socket_timeout = 10
     """The timeout in seconds for accepted connections (default 10)."""
+    
+    accepted_queue_size = -1
+    """The maximum number of requests which will be queued up before
+    the server refuses to accept it (default -1, meaning no limit)."""
+    
+    accepted_queue_timeout = 10
+    """The timeout in seconds for attempting to add a request to the
+    queue when the queue is full (default 10)."""
 
     shutdown_timeout = 5
     """The time to wait for HTTP worker threads to clean up."""
@@ -69,11 +82,13 @@ class Server(ServerAdapter):
     """The number of worker threads to start up in the pool."""
 
     thread_pool_max = -1
-    """The maximum size of the worker-thread pool. Use -1 to indicate no limit."""
+    """The maximum size of the worker-thread pool. Use -1 to indicate no limit.
+    """
 
     max_request_header_size = 500 * 1024
-    """The maximum number of bytes allowable in the request headers. If exceeded,
-    the HTTP server should return "413 Request Entity Too Large"."""
+    """The maximum number of bytes allowable in the request headers.
+    If exceeded, the HTTP server should return "413 Request Entity Too Large".
+    """
 
     max_request_body_size = 100 * 1024 * 1024
     """The maximum number of bytes allowable in the request body. If exceeded,
@@ -100,17 +115,19 @@ class Server(ServerAdapter):
 
     if py3k:
         ssl_module = 'builtin'
-        """The name of a registered SSL adaptation module to use with the builtin
-        WSGI server. Builtin options are: 'builtin' (to use the SSL library built
-        into recent versions of Python). You may also register your
-        own classes in the wsgiserver.ssl_adapters dict."""
+        """The name of a registered SSL adaptation module to use with
+        the builtin WSGI server. Builtin options are: 'builtin' (to
+        use the SSL library built into recent versions of Python).
+        You may also register your own classes in the
+        wsgiserver.ssl_adapters dict."""
     else:
         ssl_module = 'pyopenssl'
-        """The name of a registered SSL adaptation module to use with the builtin
-        WSGI server. Builtin options are 'builtin' (to use the SSL library built
-        into recent versions of Python) and 'pyopenssl' (to use the PyOpenSSL
-        project, which you must install separately). You may also register your
-        own classes in the wsgiserver.ssl_adapters dict."""
+        """The name of a registered SSL adaptation module to use with the
+        builtin WSGI server. Builtin options are 'builtin' (to use the SSL
+        library built into recent versions of Python) and 'pyopenssl' (to
+        use the PyOpenSSL project, which you must install separately). You
+        may also register your own classes in the wsgiserver.ssl_adapters
+        dict."""
 
     statistics = False
     """Turns statistics-gathering on or off for aware HTTP servers."""
@@ -157,6 +174,7 @@ class Server(ServerAdapter):
         if self.socket_host is None and self.socket_port is None:
             return None
         return (self.socket_host, self.socket_port)
+
     def _set_bind_addr(self, value):
         if value is None:
             self.socket_file = None
@@ -174,11 +192,15 @@ class Server(ServerAdapter):
                 raise ValueError("bind_addr must be a (host, port) tuple "
                                  "(for TCP sockets) or a string (for Unix "
                                  "domain sockets), not %r" % value)
-    bind_addr = property(_get_bind_addr, _set_bind_addr,
-        doc='A (host, port) tuple for TCP sockets or a str for Unix domain sockets.')
+    bind_addr = property(
+        _get_bind_addr,
+        _set_bind_addr,
+        doc='A (host, port) tuple for TCP sockets or '
+            'a str for Unix domain sockets.')
 
     def base(self):
-        """Return the base (scheme://host[:port] or sock file) for this server."""
+        """Return the base (scheme://host[:port] or sock file) for this server.
+        """
         if self.socket_file:
             return self.socket_file
 
@@ -202,4 +224,3 @@ class Server(ServerAdapter):
                 host += ":%s" % port
 
         return "%s://%s" % (scheme, host)
-