Changeset 2051

Timestamp:

10/30/08 10:05:37

Author:

lakin

Message:

Allow apps to be mounted with the same script_name passed in as they are already instantiated with. Fumanchu asked for this earlier, or at least wondered about it. I realized it would allow apps to be compatible with both CP 3.1 and CP Trunk so I added it.

Files:

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

trunk/cherrypy/_cptree.py

@@ -171 +171 @@
-        if isinstance(root, Application):
-            app = root
-
-
+ and script_name != app.script_name
+different 
-            script_name = app.script_name
-        else:

trunk/cherrypy/test/test_objectmapping.py

@@ -332 +332 @@
-        self.assertRaises(ValueError, cherrypy.tree.mount, a, '/somewhereelse')
-
+        # When mounting an application instance, 
+        # we can't specify a script name in the call to mount.
+        a = Application(object(), '/somewhere')
+        try:
+            cherrypy.tree.mount(a, '/somewhere')
+        except ValueError:
+            self.fail("tree.mount must allow script_names which are the same")
+
-        try:
-            cherrypy.tree.mount(a)