Changeset 1183

Timestamp:

07/02/06 00:49:30

Author:

fumanchu

Message:

Cleanup of cherrypy and cherrypy.config namespaces. Changed 'log_config_options' to 'log_config'. Moved cherrypy.set_config to cherrypy.config.wrap.

Files:

• trunk/cherrypy/__init__.py (modified) (4 diffs)
• trunk/cherrypy/_cpengine.py (modified) (1 diff)
• trunk/cherrypy/config.py (modified) (10 diffs)
• trunk/cherrypy/test/test_core.py (modified) (1 diff)
• trunk/cherrypy/test/test_states.py (modified) (2 diffs)

trunk/cherrypy/__init__.py

@@ -3 +3 @@
-__version__ = '3.0.0alpha'
-
-
-
-
+
+
+
+
-import config
-
@@ -107 +108 @@
-                }
-    try:
-
+_
-    except:
-        log(traceback=True)
-
-
-
-
-
-
+_
+_
+
+_
-    """Default method for logging messages (error log).
-    
@@ -128 +129 @@
-    log.log(severity, ' '.join((logtime(), context, msg)))
-
-
+_
-    """Syntactic sugar for writing to the (error) log.
-    
@@ -217 +218 @@
-        return expose_
-
-def set_config(**kwargs):
-    """Decorator to set _cp_config using the given kwargs."""
-    def wrapper(f):
-        if not hasattr(f, "_cp_config"):
-            f._cp_config = {}
-        f._cp_config.update(kwargs)
-        return f
-    return wrapper
-

trunk/cherrypy/_cpengine.py

@@ -41 +41 @@
-        
-        # Output config options to log
-_options
-output_config_map
+
+log_config
-        
-        # Autoreload. Note that, if we're not starting our own HTTP server,

trunk/cherrypy/config.py

@@ -2 +2 @@
-
-import ConfigParser
-
-
-
-
+
+
+
-
-import cherrypy
-from cherrypy.lib import autoreload, unrepr
-
-environments = {
@@ -39 +37 @@
-    """Merge one app config (from a dict, file, or filename) into another."""
-    if isinstance(other, basestring):
-
-
-dict_from_config
+cherrypy.lib.
+cherrypy.lib.
+Parser().dict_from
-    elif hasattr(other, 'read'):
-dict_from_config
+Parser().dict_from
-    
-    # Load other into base
@@ -58 +56 @@
-    'server.thread_pool': 10,
-    'log_to_screen': True,
-os.path.join(os.getcwd(), 
+_os.path.join(_os.getcwd(),_
-                             "error.log"),
-    'tools.log_tracebacks.on': True,
@@ -73 +71 @@
-    """Update globalconf from a dict, file or filename."""
-    if isinstance(conf, basestring):
-
-
-dict_from_config
+cherrypy.lib.
+cherrypy.lib.
+Parser().dict_from
-    elif hasattr(conf, 'read'):
-
+
+
-    if isinstance(conf.get("global", None), dict):
-        conf = conf["global"]
@@ -85 +84 @@
-
-def _add_builtin_screen_handler(log):
-
-
+
+
+
-    h.setFormatter(_logfmt)
-    h._cpbuiltin = "screen"
@@ -92 +92 @@
-
-def _add_builtin_file_handler(log, fname):
-
-
+_
+_
-    h.setFormatter(_logfmt)
-    h._cpbuiltin = "file"
@@ -115 +115 @@
-    if fname:
-        if h:
-
+_
-                h.close()
-                log.handlers.remove(h)
@@ -147 +147 @@
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-    """Sub-class of ConfigParser that keeps the case of options and that raises
-    an exception if the file cannot be read.
@@ -168 +178 @@
-            finally:
-                fp.close()
-
-def dict_from_config_file(config_file
-
-
-# Parse config file
-configParser = CaseSensitiveConfigParser()
-if hasattr(config_file, 'read'
-configParser.readfp(config_file)
-else:
-configParser.read(config_file)
-
-# Load INI file into a dict
-result = {}
-for section in configParser.sections()
-if section not in result:
-result[section] = {}
-for option in configParser.options(section):
-value = configParser.get(section, option, raw, var
-try:
-value = unrepr(value)
-    except Exception, x:
-            msg = ("section: %s, option: %s, value: %s" %
-                   (repr(section), repr(option), repr(value)))
-        e = cherrypy.WrongConfigValue(msg)
-    e.args += (x.__class__.__name__, x.args
-        raise e
-result[section][option] = value
-return result
-
-
-output_config_map
+
+    def as_dict(self
+    
+    # Load INI file into a dict
+    from cherrypy.lib import unrepr
+    result = {}
+    for section in self.sections(
+    if section not in result:
+            result[section] = {}
+    for option in self.options(section):
+            value = self.get(section, option, raw, vars)
+            try:
+                value = unrepr(value)
+            except Exception, x
+            msg = ("section: %s, option: %s, value: %s" %
+               (repr(section), repr(option), repr(value)))
+            e = cherrypy.WrongConfigValue(msg)
+        e.args += (x.__class__.__name__, x.arg
+        raise e
+result[section][option] = value
+return result
+
+def dict_from_file(self, file):
+if hasattr(file, 'read'):
+self.readfp(file
+else:
+self.read(file)
+    return self.as_dict()
+
+
+log_config
-    """Log engine configuration parameters."""
-    cherrypy.log("Server parameters:", 'CONFIG')
@@ -218 +228 @@
-        cherrypy.log("  %s: %s" % (var, get(var)), 'CONFIG')
-
+
+del ConfigParser

trunk/cherrypy/test/test_core.py

@@ -218 +218 @@
-        
-        # We support Python 2.3, but the @-deco syntax would look like this:
-set_config
+config.wrap
-        def page_streamed(self):
-            yield "word up"
-            raise ValueError()
-            yield "very oops"
-set_config
+config.wrap
-        assert(page_streamed._cp_config == {'stream_response': True})
-        

trunk/cherrypy/test/test_states.py

@@ -200 +200 @@
-            'server.thread_pool': 10,
-            'log_to_screen': False,
-_options
+
-            'environment': "production",
-            'show_tracebacks': True,
@@ -217 +217 @@
-                'server.thread_pool': 10,
-                'log_to_screen': False,
-_options
+
-                'environment': "production",
-                'show_tracebacks': True,