[pypy-svn] rev 608 - in pypy/trunk/src/pypy/module: . test

[tomek at codespeak.net]

Author: tomek
Date: Tue May 27 18:35:18 2003
New Revision: 608

Modified:
   pypy/trunk/src/pypy/module/builtin.py
   pypy/trunk/src/pypy/module/builtin_app.py
   pypy/trunk/src/pypy/module/test/test_builtin.py
Log:
globals() and locals() built-ins


Modified: pypy/trunk/src/pypy/module/builtin.py
==============================================================================
--- pypy/trunk/src/pypy/module/builtin.py	(original)
+++ pypy/trunk/src/pypy/module/builtin.py	Tue May 27 18:35:18 2003
@@ -27,6 +27,19 @@
     #    return w_res
     #tuple = appmethod(tuple)
 
+    def _actframe(self):
+        return self.space.getexecutioncontext().framestack.top()
+
+
+    def globals(self):
+        return self._actframe().w_globals
+    globals = appmethod(globals)
+
+    def locals(self):
+        return self._actframe().w_locals
+    locals = appmethod(locals)
+
+
     def __import__(self, w_modulename, w_locals, w_globals, w_fromlist):
         space = self.space
         try:

Modified: pypy/trunk/src/pypy/module/builtin_app.py
==============================================================================
--- pypy/trunk/src/pypy/module/builtin_app.py	(original)
+++ pypy/trunk/src/pypy/module/builtin_app.py	Tue May 27 18:35:18 2003
@@ -145,3 +145,12 @@
         if max < i:
             max = i
     return max
+
+
+def cmp(x, y):
+  if x < y:
+     return -1
+  elif x == y:
+     return 0
+  else:
+     return 1

Modified: pypy/trunk/src/pypy/module/test/test_builtin.py
==============================================================================
--- pypy/trunk/src/pypy/module/test/test_builtin.py	(original)
+++ pypy/trunk/src/pypy/module/test/test_builtin.py	Tue May 27 18:35:18 2003
@@ -1,4 +1,6 @@
 import testsupport
+from pypy.module.builtin_app import cmp
+
 
 class TestBuiltin(testsupport.TestCase):
 
@@ -26,7 +28,14 @@
       self.assertWRaises_w(s.w_TypeError,
                            w_chr,
                            w('a'))
-      
+     
+class TestCmp(testsupport.TestCase):
+   
+    def test_cmp(self):
+       self.failUnless(cmp(9, 9) == 0)
+       self.failUnless(cmp(0,9) < 0)
+       self.failUnless(cmp(9,0) > 0)
+ 
 if __name__ == '__main__':
     testsupport.main()