Changeset 2049

Timestamp:

10/15/08 12:15:15

Author:

lakin

Message:

Dissallow script_name in cherrypy.tree.mount when an instance of Application is passed in

Files:

• trunk/cherrypy/_cptree.py (modified) (1 diff)
• trunk/cherrypy/test/test_objectmapping.py (modified) (2 diffs)

trunk/cherrypy/_cptree.py

@@ -171 +171 @@
-        if isinstance(root, Application):
-            app = root
+            if script_name != "":
+                raise ValueError, "Cannot specify a script name and pass an Application instance to cherrypy.mount"
+            script_name = app.script_name
-        else:
-            app = Application(root, script_name)

trunk/cherrypy/test/test_objectmapping.py

@@ -1 +1 @@
-from cherrypy.test import test
+from cherrypy._cptree import Application
-test.prefer_parent_path()
-
@@ -324 +325 @@
-        self.assertBody("milk")
-
+    def testTreeMounting(self):
+
+        # When mounting an application instance, 
+        # we can't specify a script name in the call to mount.
+        a = Application(object(), '/somewhere')
+        self.assertRaises(ValueError, cherrypy.tree.mount, a, '/somewhereelse')
+
+        try:
+            cherrypy.tree.mount(a)
+        except ValueError:
+            self.fail("cherrypy.tree.mount incorrectly raised a ValueError")
+
+
+
+
-
-if __name__ == "__main__":