Changeset 1299

Timestamp:

08/30/06 01:13:00

Author:

fumanchu

Message:

Oops. Was using old autoreload conf keys.

Files:

• trunk/cherrypy/_cpconfig.py (modified) (3 diffs)
• trunk/cherrypy/test/test_config.py (modified) (1 diff)

trunk/cherrypy/_cpconfig.py

@@ -83 +83 @@
-environments = {
-    "staging": {
-autoreload.
+engine.autoreload_
-        'tools.log_headers.on': False,
-        'request.show_tracebacks': False,
-        },
-    "production": {
-autoreload.
+engine.autoreload_
-        'tools.log_headers.on': False,
-        'request.show_tracebacks': False,
@@ -94 +94 @@
-        },
-    "test_suite": {
-autoreload.
+engine.autoreload_
-        'tools.log_headers.on': False,
-        'request.show_tracebacks': True,
@@ -146 +146 @@
-            # Open file object
-            conf = _Parser().dict_from_file(conf)
+        else:
+            conf = conf.copy()
-        
-        if isinstance(conf.get("global", None), dict):

trunk/cherrypy/test/test_config.py

@@ -86 +86 @@
-            'log.screen': False,
-            'environment': 'test_suite',
-autoreload.
+engine.autoreload_
-            # From global config
-            'luxuryyacht': 'throatwobblermangrove',