[pypy-commit] cffi default: Fix demos

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: 
Changeset: r761:58f2cb237789
Date: 2012-08-03 16:26 +0200
http://bitbucket.org/cffi/cffi/changeset/58f2cb237789/

Log:	Fix demos

diff --git a/demo/_curses.py b/demo/_curses.py
--- a/demo/_curses.py
+++ b/demo/_curses.py
@@ -120,9 +120,9 @@
     globals().update(lib.__dict__)
     for key in range(KEY_MIN, KEY_MAX):
         key_n = keyname(key)
-        if key_n == ffi.NULL or str(key_n) == "UNKNOWN KEY":
+        if key_n == ffi.NULL or ffi.string(key_n) == "UNKNOWN KEY":
             continue
-        key_n = str(key_n).replace('(', '').replace(')', '')
+        key_n = ffi.string(key_n).replace('(', '').replace(')', '')
         globals()[key_n] = key
 
 _setup()
diff --git a/demo/bsdopendirtype.py b/demo/bsdopendirtype.py
--- a/demo/bsdopendirtype.py
+++ b/demo/bsdopendirtype.py
@@ -49,7 +49,7 @@
                 if ffi.errno != 0:
                     raise _posix_error()
                 return
-            name = str(dirent.d_name)
+            name = ffi.string(dirent.d_name)
             if name == '.' or name == '..':
                 continue
             name = dirname + name
diff --git a/demo/gmp.py b/demo/gmp.py
--- a/demo/gmp.py
+++ b/demo/gmp.py
@@ -27,4 +27,4 @@
 lib.mpz_add(a, a, b)			# a=a+b
 
 s = lib.mpz_get_str(ffi.NULL, 10, a)
-print str(s)
+print ffi.string(s)
diff --git a/demo/pwuid.py b/demo/pwuid.py
--- a/demo/pwuid.py
+++ b/demo/pwuid.py
@@ -11,4 +11,4 @@
 #include <sys/types.h>
 #include <pwd.h>
 """)
-print str(C.getpwuid(0).pw_name)
+print ffi.string(C.getpwuid(0).pw_name)
diff --git a/demo/readdir.py b/demo/readdir.py
--- a/demo/readdir.py
+++ b/demo/readdir.py
@@ -48,7 +48,7 @@
             break
         if result[0] == ffi.NULL:
             break
-        name = str(dirent.d_name)
+        name = ffi.string(dirent.d_name)
         print '%3d %s' % (dirent.d_type, name)
         if dirent.d_type == 4 and name != '.' and name != '..':
             walk(dirfd, name)
diff --git a/demo/readdir2.py b/demo/readdir2.py
--- a/demo/readdir2.py
+++ b/demo/readdir2.py
@@ -55,7 +55,7 @@
             break
         if result[0] == ffi.NULL:
             break
-        name = str(dirent.d_name)
+        name = ffi.string(dirent.d_name)
         print '%3d %s' % (dirent.d_type, name)
         if dirent.d_type == ffi.C.DT_DIR and name != '.' and name != '..':
             walk(dirfd, name)