[pypy-svn] r58686 - pypy/branch/2.5-merge/pypy/module/_minimal_curses

[arigo at codespeak.net]

Author: arigo
Date: Mon Oct  6 19:13:58 2008
New Revision: 58686

Modified:
   pypy/branch/2.5-merge/pypy/module/_minimal_curses/__init__.py
   pypy/branch/2.5-merge/pypy/module/_minimal_curses/interp_curses.py
Log:
(iko, arigo)
Finish previous check-in.


Modified: pypy/branch/2.5-merge/pypy/module/_minimal_curses/__init__.py
==============================================================================
--- pypy/branch/2.5-merge/pypy/module/_minimal_curses/__init__.py	(original)
+++ pypy/branch/2.5-merge/pypy/module/_minimal_curses/__init__.py	Mon Oct  6 19:13:58 2008
@@ -1,9 +1,13 @@
+try:
+    import _curses
+except ImportError:
+    import _minimal_curses as _curses   # when running on top of pypy-c
 
 from pypy.interpreter.mixedmodule import MixedModule
 from pypy.module._minimal_curses import fficurses
 from pypy.module._minimal_curses import interp_curses
 from pypy.rlib.nonconst import NonConstant
-import _curses
+
 
 class Module(MixedModule):
     """ Low-level interface for curses module,
@@ -21,7 +25,6 @@
         'tparm'          : 'interp_curses.tparm',
     }
 
-import _curses
 for i in dir(_curses):
     val = getattr(_curses, i)
     if i.isupper() and type(val) is int:

Modified: pypy/branch/2.5-merge/pypy/module/_minimal_curses/interp_curses.py
==============================================================================
--- pypy/branch/2.5-merge/pypy/module/_minimal_curses/interp_curses.py	(original)
+++ pypy/branch/2.5-merge/pypy/module/_minimal_curses/interp_curses.py	Mon Oct  6 19:13:58 2008
@@ -1,8 +1,7 @@
 
 from pypy.interpreter.baseobjspace import ObjSpace, W_Root
 from pypy.interpreter.error import OperationError
-
-import _curses
+from pypy.module._minimal_curses import _curses
 
 class ModuleInfo:
     def __init__(self):