trunk - Cosmetic changes to bring this more inline with the python3 version
trunk - Cosmetic changes to bring this more inline with the python3 version

cherrypy/cherrypy,cherrypy/cheroot,Safihre/cherrypy,cherrypy/cherrypy,Safihre/cherrypy