Robert Brewer avatar Robert Brewer committed c647e69

Fix for #1045 (CherryPy should support uninstantiated classes as controllers, and instantiate them on dispatching)

Comments (0)

Files changed (1)

cherrypy/_cpdispatch.py

 """
 
 import string
+import types
 
 import cherrypy
 
             controller = result.get('controller')
             controller = self.controllers.get(controller, controller)
             if controller:
+                if isinstance(controller, (type, types.ClassType)):
+                    controller = controller()
                 # Get config from the controller.
                 if hasattr(controller, "_cp_config"):
                     merge(controller._cp_config)
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.