Changeset 2039

Timestamp:

09/27/08 14:22:10

Author:

fumanchu

Message:

Fix for #848 ("and root" should be "and root is not None").

Files:

• trunk/cherrypy/_cptree.py (modified) (2 diffs)

trunk/cherrypy/_cptree.py

@@ -154 +154 @@
-        root: an instance of a "controller class" (a collection of page
-            handler methods) which represents the root of the application.
+            This may also be an Application instance, or None if using
+            a dispatcher other than the default.
-        script_name: a string containing the "mount point" of the application.
-            This should start with a slash, and be the path portion of the
@@ -173 +175 @@
-            
-            # If mounted at "", add favicon.ico
-
+
+
-                favicon = os.path.join(os.getcwd(), os.path.dirname(__file__),
-                                       "favicon.ico")