Backport of [2303], [2310], [2311] from python3 to trunk.
Backport of [2303], [2310], [2311] from python3 to trunk.

--HG--
extra : convert_revision : svn%3Ae1d34091-3ce9-0310-8e96-997e60db3bd5/trunk%402320

cherrypy/magicbus