[pypy-svn] r53508 - pypy/dist/pypy/lib

[arigo at codespeak.net]

Author: arigo
Date: Mon Apr  7 10:54:31 2008
New Revision: 53508

Modified:
   pypy/dist/pypy/lib/_minimal_curses.py
   pypy/dist/pypy/lib/readline.py
Log:
Remove the hack:  sys.modules["_curses"] = _minimal_curses

This avoids confusing users - previously, "import curses" would fail on
PyPy but "import readline, curses" would work (but crash later by
giving you an incomplete curses).


Modified: pypy/dist/pypy/lib/_minimal_curses.py
==============================================================================
--- pypy/dist/pypy/lib/_minimal_curses.py	(original)
+++ pypy/dist/pypy/lib/_minimal_curses.py	Mon Apr  7 10:54:31 2008
@@ -52,6 +52,3 @@
     if result is None:
         raise error("tparm() returned NULL")
     return result
-
-def has_key(*args):
-    XXX

Modified: pypy/dist/pypy/lib/readline.py
==============================================================================
--- pypy/dist/pypy/lib/readline.py	(original)
+++ pypy/dist/pypy/lib/readline.py	Mon Apr  7 10:54:31 2008
@@ -3,6 +3,7 @@
 """
 
 import sys, os
+import pyrepl.curses    # check to give an early ImportError
 
 ENCODING = 'latin1'     # XXX hard-coded
 
@@ -266,15 +267,6 @@
 
 def _setup():
     try:
-        import _curses
-    except ImportError:
-        try:
-            import _minimal_curses
-        except ImportError:
-            raise ImportError("readline.py needs a minimal curses module")
-        sys.modules['_curses'] = _minimal_curses
-
-    try:
         f_in = sys.stdin.fileno()
         f_out = sys.stdout.fileno()
     except AttributeError: