[pypy-svn] r5047 - pypy/trunk/src/pypy/module

[mwh at codespeak.net]

Author: mwh
Date: Fri Jun 11 13:02:42 2004
New Revision: 5047

Modified:
   pypy/trunk/src/pypy/module/__builtin__interp.py
   pypy/trunk/src/pypy/module/__builtin__module.py
Log:
support optional prompt to raw_input()
hacks to try_getattr (see comments)


Modified: pypy/trunk/src/pypy/module/__builtin__interp.py
==============================================================================
--- pypy/trunk/src/pypy/module/__builtin__interp.py	(original)
+++ pypy/trunk/src/pypy/module/__builtin__interp.py	Fri Jun 11 13:02:42 2004
@@ -52,8 +52,8 @@
     try:
         return space.getattr(w_obj, w_name)
     except OperationError, e:
-        if not e.match(space, space.w_AttributeError):
-            raise
+        # ugh, but blame CPython :-/ this is supposed to emulate
+        # hasattr, which eats all exceptions.
         return None
 
 def try_getitem(w_obj,w_key):

Modified: pypy/trunk/src/pypy/module/__builtin__module.py
==============================================================================
--- pypy/trunk/src/pypy/module/__builtin__module.py	(original)
+++ pypy/trunk/src/pypy/module/__builtin__module.py	Fri Jun 11 13:02:42 2004
@@ -31,8 +31,11 @@
     co = compile(source, filename, 'exec')
     exec co in glob, loc
 
-def raw_input():
+def raw_input(prompt=None):
     import sys
+    if prompt is not None:
+        sys.stdout.write(prompt)
+        sys.stdout.flush()
     return sys.stdin.readline()   # XXX review
 
 def input():