- 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/_cprequest.py

@@ -13,6 +13,7 @@ from cherrypy.lib import httputil, file_generator
 
 
 class Hook(object):
+
     """A callback and its metadata: failsafe, priority, and kwargs."""
 
     callback = None
@@ -71,6 +72,7 @@ class Hook(object):
 
 
 class HookMap(dict):
+
     """A map of call points to lists of callbacks (Hook objects)."""
 
     def __new__(cls, points=None):
@@ -122,7 +124,11 @@ class HookMap(dict):
 
     def __repr__(self):
         cls = self.__class__
-        return "%s.%s(points=%r)" % (cls.__module__, cls.__name__, copykeys(self))
+        return "%s.%s(points=%r)" % (
+            cls.__module__,
+            cls.__name__,
+            copykeys(self)
+        )
 
 
 # Config namespace handlers
@@ -139,14 +145,17 @@ def hooks_namespace(k, v):
         v = Hook(v)
     cherrypy.serving.request.hooks[hookpoint].append(v)
 
+
 def request_namespace(k, v):
     """Attach request attributes declared in config."""
-    # Provides config entries to set request.body attrs (like attempt_charsets).
+    # Provides config entries to set request.body attrs (like
+    # attempt_charsets).
     if k[:5] == 'body.':
         setattr(cherrypy.serving.request.body, k[5:], v)
     else:
         setattr(cherrypy.serving.request, k, v)
 
+
 def response_namespace(k, v):
     """Attach response attributes declared in config."""
     # Provides config entries to set default response headers
@@ -156,6 +165,7 @@ def response_namespace(k, v):
     else:
         setattr(cherrypy.serving.response, k, v)
 
+
 def error_page_namespace(k, v):
     """Attach error pages declared in config."""
     if k != 'default':
@@ -170,6 +180,7 @@ hookpoints = ['on_start_resource', 'before_request_body',
 
 
 class Request(object):
+
     """An HTTP request.
 
     This object represents the metadata of an HTTP request message;
@@ -304,7 +315,10 @@ class Request(object):
     methods_with_bodies = ("POST", "PUT")
     """
     A sequence of HTTP methods for which CherryPy will automatically
-    attempt to read a body from the rfile."""
+    attempt to read a body from the rfile. If you are going to change
+    this property, modify it on the configuration (recommended)
+    or on the "hook point" `on_start_resource`.
+    """
 
     body = None
     """
@@ -419,9 +433,9 @@ class Request(object):
 
     If a callable is provided, it will be called by default with keyword
     arguments 'status', 'message', 'traceback', and 'version', as for a
-    string-formatting template. The callable must return a string or iterable of
-    strings which will be set to response.body. It may also override headers or
-    perform any other processing.
+    string-formatting template. The callable must return a string or
+    iterable of strings which will be set to response.body. It may also
+    override headers or perform any other processing.
 
     If no entry is given for an error code, and no 'default' entry exists,
     a default template will be used.
@@ -704,9 +718,10 @@ class Request(object):
             name = name.title()
             value = value.strip()
 
-            # Warning: if there is more than one header entry for cookies (AFAIK,
-            # only Konqueror does that), only the last one will remain in headers
-            # (but they will be correctly stored in request.cookie).
+            # Warning: if there is more than one header entry for cookies
+            # (AFAIK, only Konqueror does that), only the last one will
+            # remain in headers (but they will be correctly stored in
+            # request.cookie).
             if "=?" in value:
                 dict.__setitem__(headers, name, httputil.decode_TEXT(value))
             else:
@@ -738,7 +753,8 @@ class Request(object):
         # First, see if there is a custom dispatch at this URI. Custom
         # dispatchers can only be specified in app.config, not in _cp_config
         # (since custom dispatchers may not even have an app.root).
-        dispatch = self.app.find_config(path, "request.dispatch", self.dispatch)
+        dispatch = self.app.find_config(
+            path, "request.dispatch", self.dispatch)
 
         # dispatch() should set self.handler and self.config
         dispatch(path)
@@ -760,13 +776,13 @@ class Request(object):
 
     def _get_body_params(self):
         warnings.warn(
-                "body_params is deprecated in CherryPy 3.2, will be removed in "
-                "CherryPy 3.3.",
-                DeprecationWarning
-            )
+            "body_params is deprecated in CherryPy 3.2, will be removed in "
+            "CherryPy 3.3.",
+            DeprecationWarning
+        )
         return self.body.params
     body_params = property(_get_body_params,
-                      doc= """
+                           doc="""
     If the request Content-Type is 'application/x-www-form-urlencoded' or
     multipart, this will be a dict of the params pulled from the entity
     body; that is, it will be the portion of request.params that come
@@ -780,6 +796,7 @@ class Request(object):
 
 
 class ResponseBody(object):
+
     """The body of the HTTP response (the response entity)."""
 
     if py3k:
@@ -822,6 +839,7 @@ class ResponseBody(object):
 
 
 class Response(object):
+
     """An HTTP Response, including status, headers, and body."""
 
     status = ""
@@ -889,7 +907,8 @@ class Response(object):
         newbody = []
         for chunk in self.body:
             if py3k and not isinstance(chunk, bytes):
-                raise TypeError("Chunk %s is not of type 'bytes'." % repr(chunk))
+                raise TypeError("Chunk %s is not of type 'bytes'." %
+                                repr(chunk))
             newbody.append(chunk)
         newbody = ntob('').join(newbody)
 
@@ -906,7 +925,8 @@ class Response(object):
         headers = self.headers
 
         self.status = "%s %s" % (code, reason)
-        self.output_status = ntob(str(code), 'ascii') + ntob(" ") + headers.encode(reason)
+        self.output_status = ntob(str(code), 'ascii') + \
+            ntob(" ") + headers.encode(reason)
 
         if self.stream:
             # The upshot: wsgiserver will chunk the response if
@@ -951,6 +971,3 @@ class Response(object):
         """
         if time.time() > self.time + self.timeout:
             self.timed_out = True
-
-
-