Added CallFunc and NoneType to unrepr. This allows object instantiation in config files.

1 files changed, 7 insertions, 0 deletions

diff --git a/cherrypy/lib/cptools.py b/cherrypy/lib/cptools.py
index c059fac7..0ebd5689 100644
--- a/cherrypy/lib/cptools.py
+++ b/cherrypy/lib/cptools.py
@@ -269,6 +269,10 @@ class Builder:
             raise UnknownType(o.__class__.__name__)
         return m(o)
     
+    def build_CallFunc(self, o):
+        callee, args, starargs, kwargs = map(self.build, o.getChildren())
+        return callee(args, *(starargs or ()), **(kwargs or {}))
+    
     def build_List(self, o):
         return map(self.build, o.getChildren())
     
@@ -314,6 +318,9 @@ class Builder:
     def build_Getattr(self, o):
         parent = self.build(o.expr)
         return getattr(parent, o.attrname)
+    
+    def build_NoneType(self, o):
+        return None
 
 
 def unrepr(s):