[pypy-svn] rev 903 - pypy/trunk/src/pypy/interpreter

[mwh at codespeak.net]

Author: mwh
Date: Sun Jun 22 11:48:37 2003
New Revision: 903

Modified:
   pypy/trunk/src/pypy/interpreter/interactive.py
   pypy/trunk/src/pypy/interpreter/py.py
Log:
some banner suppression for -i 
total banner suppression would seem to involve rewriting
code.py, sigh


Modified: pypy/trunk/src/pypy/interpreter/interactive.py
==============================================================================
--- pypy/trunk/src/pypy/interpreter/interactive.py	(original)
+++ pypy/trunk/src/pypy/interpreter/interactive.py	Sun Jun 22 11:48:37 2003
@@ -27,9 +27,11 @@
                            self.space.wrap("__name__"),
                            self.space.wrap("__main__"))
 
-    def interact(self):
-        banner = "Python %s in pypy\n%s / %s" % (
-            sys.version, self.__class__.__name__, self.space.__class__.__name__)
+    def interact(self, banner=None):
+        if banner is None:
+            banner = "Python %s in pypy\n%s / %s" % (
+                sys.version, self.__class__.__name__,
+                self.space.__class__.__name__)
         code.InteractiveConsole.interact(self, banner)
 
     def runcode(self, code):

Modified: pypy/trunk/src/pypy/interpreter/py.py
==============================================================================
--- pypy/trunk/src/pypy/interpreter/py.py	(original)
+++ pypy/trunk/src/pypy/interpreter/py.py	Sun Jun 22 11:48:37 2003
@@ -29,6 +29,7 @@
     args = option.process_options(get_main_options(), Options, argv[1:])
     space = option.objspace()
     go_interactive = Options.interactive
+    banner = ''
     if Options.command:
         try:
             main.run_string(Options.command[0], '<string>', space)
@@ -41,9 +42,13 @@
             pypyerr.operationerr.print_detailed_traceback(pypyerr.space)
     else:
         go_interactive = 1
+        banner = None
     if go_interactive:
         con = interactive.PyPyConsole(space)
-        con.interact()
+        if banner == '':
+            banner = '%s / %s'%(con.__class__.__name__,
+                                space.__class__.__name__)
+        con.interact(banner)
 
 if __name__ == '__main__':
     main_(sys.argv)