Author: Brian Kearns <[email protected]>
Branch:
Changeset: r63292:c0886eb2c291
Date: 2013-04-12 16:15 -0400
http://bitbucket.org/pypy/pypy/changeset/c0886eb2c291/
Log: actually prefer _curses, and enhance comments
diff --git a/pypy/module/_minimal_curses/__init__.py
b/pypy/module/_minimal_curses/__init__.py
--- a/pypy/module/_minimal_curses/__init__.py
+++ b/pypy/module/_minimal_curses/__init__.py
@@ -1,11 +1,13 @@
try:
- import _minimal_curses as _curses # when running on top of pypy-c
+ import _curses
except ImportError:
try:
- import _curses
+ # when running on top of pypy before it had _curses, settle for minimal
+ # we prefer _curses so any constants added make it into _minimal_curses
+ import _minimal_curses as _curses
except ImportError:
import py
- py.test.skip("no _curses or _minimal_curses module") #no _curses at all
+ py.test.skip("no _curses or _minimal_curses module") # no _curses at
all
from pypy.interpreter.mixedmodule import MixedModule
from pypy.module._minimal_curses import fficurses # for side effects
@@ -27,6 +29,7 @@
}
for i in dir(_curses):
+ i = str(i) # workaround for pypy 2.0-beta2
val = getattr(_curses, i)
if i.isupper() and type(val) is int:
Module.interpleveldefs[i] = "space.wrap(%s)" % val
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
