Author: Armin Rigo <[email protected]>
Branch: py3k
Changeset: r86394:fb2a0382b7eb
Date: 2016-08-22 10:11 +0200
http://bitbucket.org/pypy/pypy/changeset/fb2a0382b7eb/
Log: hg merge default
diff --git a/rpython/rlib/rposix.py b/rpython/rlib/rposix.py
--- a/rpython/rlib/rposix.py
+++ b/rpython/rlib/rposix.py
@@ -620,15 +620,18 @@
[rffi.CCHARP], DIRP, save_err=rffi.RFFI_SAVE_ERRNO)
c_fdopendir = external('fdopendir',
[rffi.INT], DIRP, save_err=rffi.RFFI_SAVE_ERRNO)
+ c_rewinddir = external('rewinddir',
+ [DIRP], lltype.Void, releasegil=False)
# XXX macro=True is hack to make sure we get the correct kind of
# dirent struct (which depends on defines)
c_readdir = external('readdir', [DIRP], DIRENTP,
macro=True, save_err=rffi.RFFI_FULL_ERRNO_ZERO)
c_closedir = external('closedir', [DIRP], rffi.INT, releasegil=False)
+ c_dirfd = external('dirfd', [DIRP], rffi.INT, releasegil=False)
else:
dirent_config = {}
-def _listdir(dirp):
+def _listdir(dirp, rewind=False):
result = []
while True:
direntp = c_readdir(dirp)
@@ -639,6 +642,8 @@
name = rffi.charp2str(namep)
if name != '.' and name != '..':
result.append(name)
+ if rewind:
+ c_rewinddir(dirp)
c_closedir(dirp)
if error:
raise OSError(error, "readdir failed")
@@ -649,12 +654,16 @@
Like listdir(), except that the directory is specified as an open
file descriptor.
- Note: fdlistdir() closes the file descriptor.
+ Note: fdlistdir() closes the file descriptor. To emulate the
+ Python 3.x 'os.opendir(dirfd)', you must first duplicate the
+ file descriptor.
"""
dirp = c_fdopendir(dirfd)
if not dirp:
- raise OSError(get_saved_errno(), "opendir failed")
- return _listdir(dirp)
+ error = get_saved_errno()
+ c_close(dirfd)
+ raise OSError(error, "opendir failed")
+ return _listdir(dirp, rewind=True)
@replace_os_function('listdir')
@specialize.argtype(0)
@@ -1791,12 +1800,7 @@
# Support for f... and ...at families of POSIX functions
class CConfig:
- _compilation_info_ = ExternalCompilationInfo(
- includes=['sys/stat.h',
- 'sys/time.h',
- 'unistd.h',
- 'fcntl.h'],
- )
+ _compilation_info_ = eci
for _name in """faccessat fchdir fchmod fchmodat fchown fchownat fexecve
fdopendir fpathconf fstat fstatat fstatvfs ftruncate
futimens futimes futimesat linkat chflags lchflags lchmod lchown
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
@@ -42,9 +42,9 @@
return rffi.charp2str(namep)
DT_UNKNOWN = rposix.dirent_config.get('DT_UNKNOWN', 0)
-DT_REG = rposix.dirent_config.get('DT_REG', -1)
-DT_DIR = rposix.dirent_config.get('DT_DIR', -1)
-DT_LNK = rposix.dirent_config.get('DT_LNK', -1)
+DT_REG = rposix.dirent_config.get('DT_REG', 255)
+DT_DIR = rposix.dirent_config.get('DT_DIR', 255)
+DT_LNK = rposix.dirent_config.get('DT_LNK', 255)
def get_known_type(direntp):
if rposix.HAVE_D_TYPE:
diff --git a/rpython/rlib/test/test_rposix.py b/rpython/rlib/test/test_rposix.py
--- a/rpython/rlib/test/test_rposix.py
+++ b/rpython/rlib/test/test_rposix.py
@@ -552,6 +552,14 @@
# Note: fdlistdir() always closes dirfd
assert result == ['file']
+@rposix_requires('fdlistdir')
+def test_fdlistdir_rewinddir(tmpdir):
+ tmpdir.join('file').write('text')
+ dirfd = os.open(str(tmpdir), os.O_RDONLY)
+ result1 = rposix.fdlistdir(os.dup(dirfd))
+ result2 = rposix.fdlistdir(dirfd)
+ assert result1 == result2 == ['file']
+
@rposix_requires('symlinkat')
def test_symlinkat(tmpdir):
tmpdir.join('file').write('text')
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
