[pypy-commit] pypy default: Issue #2133: accept unicodes in these curses functions (and convert them

arigo noreply at buildbot.pypy.org
Fri Sep 4 14:54:23 CEST 2015


Author: Armin Rigo <arigo at tunes.org>
Branch: 
Changeset: r79418:6e21389526e8
Date: 2015-09-04 14:54 +0200
http://bitbucket.org/pypy/pypy/changeset/6e21389526e8/

Log:	Issue #2133: accept unicodes in these curses functions (and convert
	them to ascii string), like CPython does.

diff --git a/lib_pypy/_curses.py b/lib_pypy/_curses.py
--- a/lib_pypy/_curses.py
+++ b/lib_pypy/_curses.py
@@ -1026,16 +1026,22 @@
 
 def tigetflag(capname):
     _ensure_initialised_setupterm()
+    if isinstance(capname, unicode):
+        capname = capname.encode('ascii')
     return lib.tigetflag(capname)
 
 
 def tigetnum(capname):
     _ensure_initialised_setupterm()
+    if isinstance(capname, unicode):
+        capname = capname.encode('ascii')
     return lib.tigetnum(capname)
 
 
 def tigetstr(capname):
     _ensure_initialised_setupterm()
+    if isinstance(capname, unicode):
+        capname = capname.encode('ascii')
     val = lib.tigetstr(capname)
     if int(ffi.cast("intptr_t", val)) in (0, -1):
         return None


More information about the pypy-commit mailing list