- 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/cherryd

@@ -7,6 +7,7 @@ import cherrypy
 from cherrypy.process import plugins, servers
 from cherrypy import Application
 
+
 def start(configfiles=None, daemonize=False, environment=None,
           fastcgi=False, scgi=False, pidfile=None, imports=None,
           cgi=False):
@@ -14,7 +15,7 @@ def start(configfiles=None, daemonize=False, environment=None,
     sys.path = [''] + sys.path
     for i in imports or []:
         exec("import %s" % i)
-    
+
     for c in configfiles or []:
         cherrypy.config.update(c)
         # If there's only one app mounted, merge config into it.
@@ -22,26 +23,26 @@ def start(configfiles=None, daemonize=False, environment=None,
             for app in cherrypy.tree.apps.values():
                 if isinstance(app, Application):
                     app.merge(c)
-    
+
     engine = cherrypy.engine
-    
+
     if environment is not None:
         cherrypy.config.update({'environment': environment})
-    
+
     # Only daemonize if asked to.
     if daemonize:
         # Don't print anything to stdout/sterr.
         cherrypy.config.update({'log.screen': False})
         plugins.Daemonizer(engine).subscribe()
-    
+
     if pidfile:
         plugins.PIDFile(engine, pidfile).subscribe()
-    
+
     if hasattr(engine, "signal_handler"):
         engine.signal_handler.subscribe()
     if hasattr(engine, "console_control_handler"):
         engine.console_control_handler.subscribe()
-    
+
     if (fastcgi and (scgi or cgi)) or (scgi and cgi):
         cherrypy.log.error("You may only specify one of the cgi, fastcgi, and "
                            "scgi options.", 'ENGINE')
@@ -51,7 +52,7 @@ def start(configfiles=None, daemonize=False, environment=None,
         cherrypy.config.update({'engine.autoreload_on': False})
         # Turn off the default HTTP server (which is subscribed by default).
         cherrypy.server.unsubscribe()
-        
+
         addr = cherrypy.server.bind_addr
         if fastcgi:
             f = servers.FlupFCGIServer(application=cherrypy.tree,
@@ -64,7 +65,7 @@ def start(configfiles=None, daemonize=False, environment=None,
                                       bindAddress=addr)
         s = servers.ServerAdapter(engine, httpserver=f, bind_addr=addr)
         s.subscribe()
-    
+
     # Always start the engine; this will start all other services
     try:
         engine.start()
@@ -77,7 +78,7 @@ def start(configfiles=None, daemonize=False, environment=None,
 
 if __name__ == '__main__':
     from optparse import OptionParser
-    
+
     p = OptionParser()
     p.add_option('-c', '--config', action="append", dest='config',
                  help="specify config file(s)")
@@ -86,7 +87,8 @@ if __name__ == '__main__':
     p.add_option('-e', '--environment', dest='environment', default=None,
                  help="apply the given config environment")
     p.add_option('-f', action="store_true", dest='fastcgi',
-                 help="start a fastcgi server instead of the default HTTP server")
+                 help="start a fastcgi server instead of the default HTTP "
+                      "server")
     p.add_option('-s', action="store_true", dest='scgi',
                  help="start a scgi server instead of the default HTTP server")
     p.add_option('-x', action="store_true", dest='cgi',
@@ -98,12 +100,11 @@ if __name__ == '__main__':
     p.add_option('-P', '--Path', action="append", dest='Path',
                  help="add the given paths to sys.path")
     options, args = p.parse_args()
-    
+
     if options.Path:
         for p in options.Path:
             sys.path.insert(0, p)
-    
+
     start(options.config, options.daemonize,
           options.environment, options.fastcgi, options.scgi,
           options.pidfile, options.imports, options.cgi)
-