[pypy-svn] r53451 - in pypy/dist/pypy: config lib translator/goal

[arigo at codespeak.net]

Author: arigo
Date: Sun Apr  6 16:18:09 2008
New Revision: 53451

Added:
   pypy/dist/pypy/lib/_minimal_curses.py
      - copied unchanged from r53449, user/arigo/hack/pypy-hack/_minimal_curses.py
   pypy/dist/pypy/lib/readline.py
      - copied unchanged from r53449, user/arigo/hack/pypy-hack/readline.py
Modified:
   pypy/dist/pypy/config/pypyoption.py
   pypy/dist/pypy/translator/goal/app_main.py
Log:
* A new readline.py quite more complete than module/readline, based on
  pyrepl.

* A new _minimal_curses.py based on ctypes, with just enough to make
  pyrepl happy.

* Change the default modules of --allworkingmodules so that readline is
  no longer included, but _rawffi is (on non-Windows platforms).



Modified: pypy/dist/pypy/config/pypyoption.py
==============================================================================
--- pypy/dist/pypy/config/pypyoption.py	(original)
+++ pypy/dist/pypy/config/pypyoption.py	Sun Apr  6 16:18:09 2008
@@ -23,7 +23,7 @@
 working_modules = default_modules.copy()
 working_modules.update(dict.fromkeys(
     ["_socket", "unicodedata", "mmap", "fcntl", "rctime", "select",
-     "crypt", "signal", "dyngram", "readline", "termios", "zlib",
+     "crypt", "signal", "dyngram", "_rawffi", "termios", "zlib",
      "struct", "md5", "sha", "bz2",
     ]
 ))
@@ -33,6 +33,7 @@
     del working_modules["readline"]
     del working_modules["crypt"]
     del working_modules["termios"]
+    del working_modules["_rawffi"]
 
 
 module_dependencies = {}

Modified: pypy/dist/pypy/translator/goal/app_main.py
==============================================================================
--- pypy/dist/pypy/translator/goal/app_main.py	(original)
+++ pypy/dist/pypy/translator/goal/app_main.py	Sun Apr  6 16:18:09 2008
@@ -337,18 +337,7 @@
             success = run_toplevel(execfile, sys.argv[0], mainmodule.__dict__)
             
         if is_interactive():
-            try:
-                import _curses
-                import termios
-                from pyrepl.python_reader import main
-                from pyrepl import cmdrepl
-                #import pdb
-                #pdb.Pdb = cmdrepl.replize(pdb.Pdb, 1)
-            except ImportError:
-                success = run_toplevel(interactive_console, mainmodule)
-            else:
-                main(print_banner=False, clear_main=False)
-                success = True
+            success = run_toplevel(interactive_console, mainmodule)
     except SystemExit, e:
         return e.code
     else: