Changeset 1699

Timestamp:

07/21/07 12:24:26

Author:

fumanchu

Message:

Added builtins and subscript to unrepr.

Files:

• trunk/cherrypy/lib/__init__.py (modified) (2 diffs)
• trunk/cherrypy/test/test_config.py (modified) (2 diffs)
• trunk/cherrypy/tutorial/__init__.py (modified) (1 diff)

trunk/cherrypy/lib/__init__.py

@@ -46 +46 @@
-        return m(o)
-    
+    def build_Subscript(self, o):
+        expr, flags, subs = o.getChildren()
+        expr = self.build(expr)
+        subs = self.build(subs)
+        return expr[subs]
+    
-    def build_CallFunc(self, o):
-        children = map(self.build, o.getChildren())
@@ -82 +88 @@
-            return modules(o.name)
-        except ImportError:
+            pass
+        
+        # See if the Name is in __builtin__.
+        try:
+            import __builtin__
+            return getattr(__builtin__, o.name)
+        except AttributeError:
-            pass
-        

trunk/cherrypy/test/test_config.py

@@ -91 +91 @@
-neg: -1234
-filename: os.path.join(sys.prefix, "hello.py")
+thing1: cherrypy.lib.http.response_codes[404]
+thing2: __import__('cherrypy.tutorial', globals(), locals(), ['']).thing2
-
-[/favicon.ico]
@@ -161 +163 @@
-        self.getPage("/repr?key=filename")
-        self.assertBody(repr(os.path.join(sys.prefix, "hello.py")))
+        
+        self.getPage("/repr?key=thing1")
+        self.assertBody(repr(cherrypy.lib.http.response_codes[404]))
+        
+        self.getPage("/repr?key=thing2")
+        from cherrypy.tutorial import thing2
+        self.assertBody(repr(thing2))
-    
-    def testCustomNamespaces(self):

trunk/cherrypy/tutorial/__init__.py

@@ +1 @@
+
+# This is used in test_config to test unrepr of "from A import B"
+thing2 = object()