Changeset 381

Timestamp:

06/25/05 15:01:48

Author:

peterhunt

Message:

added fun decorator utility funcs and getSPecialAttributePath

Files:

• trunk/cherrypy/_cputil.py (modified) (2 diffs)
• trunk/cherrypy/lib/cptools.py (modified) (1 diff)

trunk/cherrypy/_cputil.py

@@ -65 +65 @@
-
-def getSpecialAttribute(name):
-
+
+
+
-    
-    # First, we look in the right-most object if this special attribute is implemented.
@@ -86 +88 @@
-                                    % repr(name))
-
+def getSpecialAttributePath(name):
+    """ Return the path to the special attribute """
+    objectList = getObjectTrail()
+    if objectList:
+        pathList = (cpg.request.objectPath or cpg.request.path).split("/")[1:]
+        for i in xrange(len(objectList) - 1, -1, -1):
+            if hasattr(objectList[i], name):
+                return "/" + "/".join(pathList[:i] + [name])
+    raise cperror.InternalError("Special attribute %s could not be found"
+                                    % repr(name))
-
-def _cpLogMessage(msg, context = '', severity = 0):

trunk/cherrypy/lib/cptools.py

@@ -28 +28 @@
-
-"""
-
+ and classes.
-"""
+
+import inspect
+
+def decorate(func, decorator):
+    """
+    Return the decorated func. This will automatically copy all
+    non-standard attributes (like exposed) to the newly decorated function.
+    """
+    newfunc = decorator(func)
+    for (k,v) in inspect.getmembers(func):
+        if not hasattr(newfunc, k):
+            setattr(newfunc, k, v)
+    return newfunc
+
+def decorateAll(obj, decorator):
+    """
+    Recursively decorate all exposed functions of obj and all of its children,
+    grandchildren, etc. If you used to use aspects, you might want to look
+    into these. This function modifies obj; there is no return value.
+    """
+    obj_type = type(obj)
+    for (k,v) in inspect.getmembers(obj):
+        if hasattr(obj_type, k): # only deal with user-defined attributes
+            continue
+        if callable(v) and getattr(v, "exposed", False):
+            setattr(obj, k, decorate(v, decorator))
+        decorateAll(v, decorator)
-
-class ExposeItems: