Commits

Robert Brewer committed cbdc8bf

Bugfix in Tree if cherrypy.root is None.

Comments (0)

Files changed (3)

cherrypy/_cptree.py

         m = self._mount_points
         if "/" not in m:
             import cherrypy
-            if not isinstance(cherrypy.root, Root):
+            if cherrypy.root is not None and not isinstance(cherrypy.root, Root):
                 m["/"] = cherrypy.root
         return m
     def _set_mount_points(self, newvalue):

cherrypy/test/helper.py

 The actual script that runs the entire CP test suite is called
 "test.py" (in this folder); test.py calls this module as a library.
 
-Usage:
-    Each individual test_*.py module imports this module (helper),
-    usually to make an instance of CPWebCase, and then call testmain().
-    
-    The CP test suite script (test.py) imports this module and calls
-    run_test_suite, possibly more than once. CP applications may also
-    import test.py (to use TestHarness), which then calls helper.py.
+Usage
+=====
+Each individual test_*.py module imports this module (helper),
+usually to make an instance of CPWebCase, and then call testmain().
+
+The CP test suite script (test.py) imports this module and calls
+run_test_suite, possibly more than once. CP applications may also
+import test.py (to use TestHarness), which then calls helper.py.
 """
 
 # GREAT CARE has been taken to separate this module from test.py,

cherrypy/test/test.py

             self.start_coverage()
         
         if self.profile:
+            conf = conf or {}
             conf['profiling.on'] = True
         
         if self.server == 'modpy':
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.