[pypy-svn] r79338 - in pypy/trunk/pypy/interpreter: . test

cfbolz at codespeak.net cfbolz at codespeak.net
Mon Nov 22 14:01:32 CET 2010


Author: cfbolz
Date: Mon Nov 22 14:01:30 2010
New Revision: 79338

Modified:
   pypy/trunk/pypy/interpreter/argument.py
   pypy/trunk/pypy/interpreter/test/test_argument.py
Log:
fix test in module/_stackless.


Modified: pypy/trunk/pypy/interpreter/argument.py
==============================================================================
--- pypy/trunk/pypy/interpreter/argument.py	(original)
+++ pypy/trunk/pypy/interpreter/argument.py	Mon Nov 22 14:01:30 2010
@@ -402,9 +402,10 @@
         space = self.space
         w_args = space.newtuple(self.arguments_w)
         w_kwds = space.newdict()
-        for i in range(len(self.keywords)):
-            space.setitem(w_kwds, space.wrap(self.keywords[i]),
-                                  self.keywords_w[i])
+        if self.keywords is not None:
+            for i in range(len(self.keywords)):
+                space.setitem(w_kwds, space.wrap(self.keywords[i]),
+                                      self.keywords_w[i])
         return w_args, w_kwds
 
 class ArgumentsForTranslation(Arguments):

Modified: pypy/trunk/pypy/interpreter/test/test_argument.py
==============================================================================
--- pypy/trunk/pypy/interpreter/test/test_argument.py	(original)
+++ pypy/trunk/pypy/interpreter/test/test_argument.py	Mon Nov 22 14:01:30 2010
@@ -453,7 +453,11 @@
         assert set(args.keywords) == set(['a', 'b'])
         assert args.keywords_w[args.keywords.index('a')] == 2
         assert args.keywords_w[args.keywords.index('b')] == 3        
-                                 
+
+        args = Arguments(space, [1])
+        w_args, w_kwds = args.topacked()
+        assert w_args == (1, )
+        assert not w_kwds
 
 class TestErrorHandling(object):
     def test_missing_args(self):



More information about the Pypy-commit mailing list