Author: Armin Rigo <[email protected]>
Branch: cffi-1.0
Changeset: r1884:e6cfa95230d2
Date: 2015-04-29 22:38 +0200
http://bitbucket.org/cffi/cffi/changeset/e6cfa95230d2/
Log: Python 3 compatible code in these demos
diff --git a/demo/bsdopendirtype.py b/demo/bsdopendirtype.py
--- a/demo/bsdopendirtype.py
+++ b/demo/bsdopendirtype.py
@@ -16,10 +16,10 @@
def opendir(dir):
if len(dir) == 0:
- dir = '.'
+ dir = b'.'
dirname = dir
- if not dirname.endswith('/'):
- dirname += '/'
+ if not dirname.endswith(b'/'):
+ dirname += b'/'
dirp = lib.opendir(dir)
if dirp == ffi.NULL:
raise _posix_error()
@@ -32,7 +32,7 @@
raise _posix_error()
return
name = ffi.string(dirent.d_name)
- if name == '.' or name == '..':
+ if name == b'.' or name == b'..':
continue
name = dirname + name
try:
@@ -44,5 +44,5 @@
lib.closedir(dirp)
if __name__ == '__main__':
- for name, smode in opendir('/tmp'):
- print hex(smode), name
+ for name, smode in opendir(b'/tmp'):
+ print(hex(smode), name)
diff --git a/demo/recopendirtype.py b/demo/recopendirtype.py
--- a/demo/recopendirtype.py
+++ b/demo/recopendirtype.py
@@ -16,10 +16,10 @@
def opendir(dir):
if len(dir) == 0:
- dir = '.'
+ dir = b'.'
dirname = dir
- if not dirname.endswith('/'):
- dirname += '/'
+ if not dirname.endswith(b'/'):
+ dirname += b'/'
dirp = lib.opendir(dir)
if dirp == ffi.NULL:
raise _posix_error()
@@ -34,7 +34,7 @@
if result[0] == ffi.NULL:
return #
name = ffi.string(dirent.d_name)
- if name == '.' or name == '..':
+ if name == b'.' or name == b'..':
continue
name = dirname + name
try:
@@ -46,5 +46,5 @@
lib.closedir(dirp)
if __name__ == '__main__':
- for name, smode in opendir('/tmp'):
- print hex(smode), name
+ for name, smode in opendir(b'/tmp'):
+ print(hex(smode), name)
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
