[pypy-svn] rev 2399 - in pypy/trunk/src/pypy: interpreter module module/test

[pmaupin at codespeak.net]

Author: pmaupin
Date: Tue Dec 16 17:45:36 2003
New Revision: 2399

Modified:
   pypy/trunk/src/pypy/interpreter/extmodule.py
   pypy/trunk/src/pypy/module/builtin.py
   pypy/trunk/src/pypy/module/test/test_builtin.py
Log:
Added divmod

Modified: pypy/trunk/src/pypy/interpreter/extmodule.py
==============================================================================
--- pypy/trunk/src/pypy/interpreter/extmodule.py	(original)
+++ pypy/trunk/src/pypy/interpreter/extmodule.py	Tue Dec 16 17:45:36 2003
@@ -31,7 +31,7 @@
                         continue  # ignore CPython functions
 
                     # ignore tricky class-attrs we can't send from interp to app-level 
-                    if name in ('__metaclass__','__module__','w_dict',):
+                    if name in ('__metaclass__','__module__',):
                         continue
                     contents.setdefault(space.wrap(name), space.wrap(value))
         w_contents = space.newdict(contents.items())

Modified: pypy/trunk/src/pypy/module/builtin.py
==============================================================================
--- pypy/trunk/src/pypy/module/builtin.py	(original)
+++ pypy/trunk/src/pypy/module/builtin.py	Tue Dec 16 17:45:36 2003
@@ -520,6 +520,8 @@
                 max = i
         return max
 
+    def app_divmod(self, x, y):
+        return x//y, x%y
 
     def app_cmp(self, x, y):
         """return 0 when x == y, -1 when x < y and 1 when x > y """

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 Dec 16 17:45:36 2003
@@ -128,6 +128,9 @@
         # To make this test, we need autopath to work in application space.
         #self.assertEquals(execfile('emptyfile.py'), None)
 
+    def test_divmod(self):
+        self.assertEquals(divmod(15,10),(1,5))
+
 class TestInternal(test.IntTestCase):
 
     def setUp(self):