[pypy-svn] rev 638 - pypy/trunk/src/pypy/module

[lac at codespeak.net]

Author: lac
Date: Wed May 28 18:44:24 2003
New Revision: 638

Modified:
   pypy/trunk/src/pypy/module/builtin_app.py
Log:
make vars return the locals, not just print them



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	Wed May 28 18:44:24 2003
@@ -170,13 +170,11 @@
 
 def vars(*objectt):
     if len(objectt) == 0:
-        locals()
+        return locals()
+    elif len(objectt) != 1:
+        raise TypeError, "vars() takes at most 1 argument."
     else:
         try:
-            object, = objectt
-        except ValueError:
-            raise TypeError, "vars() takes at most 1 argument (2 given)"
-        try:
             return object.__dict__
         except AttributeError:
             raise TypeError, "vars() argument must have __dict__ attribute"