Changeset 1404

Timestamp:

10/21/06 13:33:00

Author:

fumanchu

Message:

Quickstart now calls config.update. See http://groups.google.com/group/cherrypy-users/browse_thread/thread/e1e7d4088dcddeac.

Files:

• trunk/cherrypy/__init__.py (modified) (3 diffs)

trunk/cherrypy/__init__.py

@@ -25 +25 @@
-def quickstart(root, script_name="", config=None):
-    """Mount the given app, start the engine and builtin server, then block."""
+    _global_conf_alias.update(config)
-    tree.mount(root, script_name, config)
-    server.quickstart()
@@ -170 +171 @@
-    If you call url(qs=cherrypy.request.query_string), you should get the
-    original browser URL (assuming no Internal redirections).
+    
+    If relative is False (the default), the output will be an absolute URL
+    (usually including the scheme, host, vhost, and script_name).
+    If relative is True, the output will instead be a URL that is relative
+    to the current request path, perhaps including '..' atoms.
-    """
-    if qs:
@@ -252 +258 @@
-
-
-Set up config last so it can wrap
+import _cpconfig last so it can reference
-from cherrypy import _cpconfig
-
+
+
+