[pypy-commit] pypy default: Attempt to import interp_scandir on Windows
rlamy
pypy.commits at gmail.com
Tue May 2 11:58:37 EDT 2017
Author: Ronan Lamy <ronan.lamy at gmail.com>
Branch:
Changeset: r91166:5d9621822874
Date: 2017-04-01 18:42 +0200
http://bitbucket.org/pypy/pypy/changeset/5d9621822874/
Log: Attempt to import interp_scandir on Windows (grafted from
ba2d0d7ea48e2dfafed9c17d9a125a46664247bb)
diff --git a/rpython/rlib/rposix_scandir.py b/rpython/rlib/rposix_scandir.py
--- a/rpython/rlib/rposix_scandir.py
+++ b/rpython/rlib/rposix_scandir.py
@@ -1,4 +1,4 @@
-from rpython.rlib import rposix
+from rpython.rlib import rposix, rwin32
from rpython.rlib.objectmodel import specialize
from rpython.rtyper.lltypesystem import lltype, rffi
@@ -17,7 +17,8 @@
def closedir(dirp):
rposix.c_closedir(dirp)
-NULL_DIRP = lltype.nullptr(rposix.DIRP.TO)
+if not rwin32.WIN32:
+ NULL_DIRP = lltype.nullptr(rposix.DIRP.TO)
def nextentry(dirp):
"""Read the next entry and returns an opaque object.
More information about the pypy-commit
mailing list