[pypy-commit] cffi default: Fix the demos (None => ffi.NULL)

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: 
Changeset: r522:4606e24045b3
Date: 2012-06-26 11:14 +0200
http://bitbucket.org/cffi/cffi/changeset/4606e24045b3/

Log:	Fix the demos (None => ffi.NULL)

diff --git a/demo/_curses.py b/demo/_curses.py
--- a/demo/_curses.py
+++ b/demo/_curses.py
@@ -120,7 +120,7 @@
     globals().update(lib.__dict__)
     for key in range(KEY_MIN, KEY_MAX):
         key_n = keyname(key)
-        if key_n is None or str(key_n) == "UNKNOWN KEY":
+        if key_n == ffi.NULL or str(key_n) == "UNKNOWN KEY":
             continue
         key_n = str(key_n).replace('(', '').replace(')', '')
         globals()[key_n] = key
diff --git a/demo/bsdopendirtype.py b/demo/bsdopendirtype.py
--- a/demo/bsdopendirtype.py
+++ b/demo/bsdopendirtype.py
@@ -39,13 +39,13 @@
     if not dirname.endswith('/'):
         dirname += '/'
     dirp = lib.opendir(dir)
-    if dirp is None:
+    if dirp == ffi.NULL:
         raise _posix_error()
     try:
         while True:
             ffi.errno = 0
             dirent = lib.readdir(dirp)
-            if dirent is None:
+            if dirent == ffi.NULL:
                 if ffi.errno != 0:
                     raise _posix_error()
                 return
diff --git a/demo/readdir.py b/demo/readdir.py
--- a/demo/readdir.py
+++ b/demo/readdir.py
@@ -42,7 +42,7 @@
         if ffi.C.readdir_r(dir, dirent, result):
             # error in readdir_r()
             break
-        if result[0] is None:
+        if result[0] == ffi.NULL:
             break
         name = str(dirent.d_name)
         print '%3d %s' % (dirent.d_type, name)
diff --git a/demo/readdir2.py b/demo/readdir2.py
--- a/demo/readdir2.py
+++ b/demo/readdir2.py
@@ -49,7 +49,7 @@
         if ffi.C.readdir_r(dir, dirent, result):
             # error in readdir_r()
             break
-        if result[0] is None:
+        if result[0] == ffi.NULL:
             break
         name = str(dirent.d_name)
         print '%3d %s' % (dirent.d_type, name)
diff --git a/demo/xclient.py b/demo/xclient.py
--- a/demo/xclient.py
+++ b/demo/xclient.py
@@ -28,7 +28,7 @@
 
 def main():
     display = XOpenDisplay(None)
-    if display is None:
+    if display == ffi.NULL:
         raise XError("cannot open display")
     w = XCreateSimpleWindow(display, DefaultRootWindow(display),
                             10, 10, 500, 350, 0, 0, 0)