Changeset 521

Timestamp:

08/08/05 13:35:03

Author:

fumanchu

Message:

1. Partial fix for ticket #242 (ability to specify attributes in a config file).
2. Moved modules, attributes functions from server.py to _cputil.py.
3. A couple of newline fixes for unrelated modules.

Files:

• trunk/cherrypy/_cputil.py (modified) (6 diffs)
• trunk/cherrypy/lib/cptools.py (modified) (previous)
• trunk/cherrypy/lib/filter/cachefilter.py (modified) (previous)
• trunk/cherrypy/server.py (modified) (2 diffs)

trunk/cherrypy/_cputil.py

@@ -250 +250 @@
-        sys.path.remove(path)   
-
+
-# public domain "unrepr" implementation, found on the web and then improved.
-import compiler
@@ -258 +259 @@
-    return p.getChildren()[1].getChildren()[0].getChildren()[1]
-
+
-class UnknownType(Exception):
-pass
-lize the built 
+
+alize the built-
-    for n in xrange(len(_cpDefaultInputFilterList)):
-        try:
@@ -272 +274 @@
-        except:
-            pass
-
+
+
-class Builder:
-
+
-    def build(self, o):
-+
+ + 
-        if m is None:
-            raise UnknownType(o.__class__.__name__)
-        return m(o)
-
+
-    def build_List(self, o):
-        return map(self.build, o.getChildren())
-
+
-    def build_Const(self, o):
-        return o.value
-
+
-    def build_Dict(self, o):
-        d = {}
@@ -293 +296 @@
-            d[el] = i.next()
-        return d
-
+
-    def build_Tuple(self, o):
-        return tuple(self.build_List(o))
-
+
-    def build_Name(self, o):
-        if o.name == 'None':
-            return None
-el
+
-            return True
-el
+
-            return False
+        
+        # See if the Name is a package or module
+        try:
+            return modules(o.name)
+        except ImportError:
+            pass
+        
-        raise UnknownType(o.name)
-
+
-    def build_Add(self, o):
-        real, imag = map(self.build_Const, o.getChildren())
@@ -315 +325 @@
-            raise UnknownType('Add')
-        return real+imag
+    
+    def build_Getattr(self, o):
+        parent = self.build(o.expr)
+        return getattr(parent, o.attrname)
+
-
-def unrepr(s):
@@ -322 +337 @@
-        return Builder().build(getObj(s))
-    except:
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

trunk/cherrypy/server.py

@@ -143 +143 @@
-        serverClass = cherrypy.config.get("server.class", None)
-    if serverClass and isinstance(serverClass, basestring):
-
+cherrypy._cputil.
-    if serverClass is None:
-        import _cpwsgi
@@ -172 +172 @@
-        stop()
-
-def modules(modulePath):
-    """Load a module and retrieve a reference to that module."""
-    try:
-        aMod = sys.modules[modulePath]
-        if aMod is None:
-            raise KeyError
-    except KeyError:
-        # The last [''] is important.
-        aMod = __import__(modulePath, globals(), locals(), [''])
-    return aMod
-
-def attributes(fullAttributeName):
-    """Load a module and retrieve an attribute of that module."""
-    
-    # Parse out the path, module, and attribute
-    lastDot = fullAttributeName.rfind(u".")
-    attrName = fullAttributeName[lastDot + 1:]
-    modPath = fullAttributeName[:lastDot]
-    
-    aMod = modules(modPath)
-    # Let an AttributeError propagate outward.
-    try:
-        anAttr = getattr(aMod, attrName)
-    except AttributeError:
-        raise AttributeError("'%s' object has no attribute '%s'"
-                             % (modPath, attrName))
-    
-    # Return a reference to the attribute.
-    return anAttr
-
-
-seen_threads = {}