[pypy-commit] pypy default: transplant 5b7c09b8a1af and improve to only call ffi.string once

[bdkearns]

Author: Brian Kearns <bdkearns at gmail.com>
Branch: 
Changeset: r63083:3e8013bc9ef3
Date: 2013-04-05 20:43 -0400
http://bitbucket.org/pypy/pypy/changeset/3e8013bc9ef3/

Log:	transplant 5b7c09b8a1af and improve to only call ffi.string once

diff --git a/lib_pypy/_curses.py b/lib_pypy/_curses.py
--- a/lib_pypy/_curses.py
+++ b/lib_pypy/_curses.py
@@ -359,9 +359,12 @@
     if not lib._m_NetBSD:
         for key in range(lib.KEY_MIN, lib.KEY_MAX):
             key_n = lib.keyname(key)
-            if key_n == ffi.NULL or ffi.string(key_n) == "UNKNOWN KEY":
+            if key_n == ffi.NULL:
                 continue
-            key_n = ffi.string(key_n).replace('(', '').replace(')', '')
+            key_n = ffi.string(key_n)
+            if key_n == b"UNKNOWN KEY":
+                continue
+            key_n = key_n.decode().replace('(', '').replace(')', '')
             globals()[key_n] = key
 
 _setup()