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

@@ -125,6 +125,7 @@ from cherrypy.lib import reprconf
 # Deprecated in  CherryPy 3.2--remove in 3.3
 NamespaceSet = reprconf.NamespaceSet
 
+
 def merge(base, other):
     """Merge one app config (from a dict, file, or filename) into another.
 
@@ -146,6 +147,7 @@ def merge(base, other):
 
 
 class Config(reprconf.Config):
+
     """The 'global' configuration data for the entire CherryPy process."""
 
     def update(self, config):
@@ -157,7 +159,7 @@ class Config(reprconf.Config):
 
     def _apply(self, config):
         """Update self from a dict."""
-        if isinstance(config.get("global", None), dict):
+        if isinstance(config.get("global"), dict):
             if len(config) > 1:
                 cherrypy.checker.global_config_contained_paths = True
             config = config["global"]
@@ -171,6 +173,7 @@ class Config(reprconf.Config):
             raise TypeError(
                 "The cherrypy.config decorator does not accept positional "
                 "arguments; you must use keyword arguments.")
+
         def tool_decorator(f):
             if not hasattr(f, "_cp_config"):
                 f._cp_config = {}
@@ -180,25 +183,26 @@ class Config(reprconf.Config):
         return tool_decorator
 
 
+# Sphinx begin config.environments
 Config.environments = environments = {
     "staging": {
-        'engine.autoreload_on': False,
+        'engine.autoreload.on': False,
         'checker.on': False,
         'tools.log_headers.on': False,
         'request.show_tracebacks': False,
         'request.show_mismatched_params': False,
-        },
+    },
     "production": {
-        'engine.autoreload_on': False,
+        'engine.autoreload.on': False,
         'checker.on': False,
         'tools.log_headers.on': False,
         'request.show_tracebacks': False,
         'request.show_mismatched_params': False,
         'log.screen': False,
-        },
+    },
     "embedded": {
         # For use with CherryPy embedded in another deployment stack.
-        'engine.autoreload_on': False,
+        'engine.autoreload.on': False,
         'checker.on': False,
         'tools.log_headers.on': False,
         'request.show_tracebacks': False,
@@ -206,16 +210,17 @@ Config.environments = environments = {
         'log.screen': False,
         'engine.SIGHUP': None,
         'engine.SIGTERM': None,
-        },
+    },
     "test_suite": {
-        'engine.autoreload_on': False,
+        'engine.autoreload.on': False,
         'checker.on': False,
         'tools.log_headers.on': False,
         'request.show_tracebacks': True,
         'request.show_mismatched_params': True,
         'log.screen': False,
-        },
-    }
+    },
+}
+# Sphinx end config.environments
 
 
 def _server_namespace_handler(k, v):
@@ -245,9 +250,24 @@ def _server_namespace_handler(k, v):
         setattr(cherrypy.server, k, v)
 Config.namespaces["server"] = _server_namespace_handler
 
+
 def _engine_namespace_handler(k, v):
     """Backward compatibility handler for the "engine" namespace."""
     engine = cherrypy.engine
+
+    deprecated = {
+        'autoreload_on': 'autoreload.on',
+        'autoreload_frequency': 'autoreload.frequency',
+        'autoreload_match': 'autoreload.match',
+        'reload_files': 'autoreload.files',
+        'deadlock_poll_freq': 'timeout_monitor.frequency'
+    }
+
+    if k in deprecated:
+        engine.log(
+            'WARNING: Use of engine.%s is deprecated and will be removed in a '
+            'future version. Use engine.%s instead.' % (k, deprecated[k]))
+
     if k == 'autoreload_on':
         if v:
             engine.autoreload.subscribe()
@@ -272,7 +292,10 @@ def _engine_namespace_handler(k, v):
             if v and hasattr(getattr(plugin, 'subscribe', None), '__call__'):
                 plugin.subscribe()
                 return
-            elif (not v) and hasattr(getattr(plugin, 'unsubscribe', None), '__call__'):
+            elif (
+                (not v) and
+                hasattr(getattr(plugin, 'unsubscribe', None), '__call__')
+            ):
                 plugin.unsubscribe()
                 return
         setattr(plugin, attrname, v)
@@ -286,10 +309,9 @@ def _tree_namespace_handler(k, v):
     if isinstance(v, dict):
         for script_name, app in v.items():
             cherrypy.tree.graft(app, script_name)
-            cherrypy.engine.log("Mounted: %s on %s" % (app, script_name or "/"))
+            cherrypy.engine.log("Mounted: %s on %s" %
+                                (app, script_name or "/"))
     else:
         cherrypy.tree.graft(v, v.script_name)
         cherrypy.engine.log("Mounted: %s on %s" % (v, v.script_name or "/"))
 Config.namespaces["tree"] = _tree_namespace_handler
-
-