Author: Armin Rigo <ar...@tunes.org>
Branch:
Changeset: r91578:d936612da330
Date: 2017-06-11 23:16 +0200
http://bitbucket.org/pypy/pypy/changeset/d936612da330/
Log: fixes
diff --git a/rpython/rlib/rposix_stat.py b/rpython/rlib/rposix_stat.py
--- a/rpython/rlib/rposix_stat.py
+++ b/rpython/rlib/rposix_stat.py
@@ -711,9 +711,9 @@
with lltype.scoped_alloc(
win32traits.BY_HANDLE_FILE_INFORMATION) as data:
- res = rwin32.GetFileInformationByHandle(hFile, data)
+ res = win32traits.GetFileInformationByHandle(hFile, data)
errcode = rwin32.GetLastError_saved()
- win32.CloseHandle(hFile)
+ rwin32.CloseHandle(hFile)
if res == 0:
raise WindowsError(errcode, "GetFileInformationByHandle
failed")
return win32_by_handle_info_to_stat(win32traits, data)
diff --git a/rpython/rlib/rwin32file.py b/rpython/rlib/rwin32file.py
--- a/rpython/rlib/rwin32file.py
+++ b/rpython/rlib/rwin32file.py
@@ -109,7 +109,7 @@
INVALID_FILE_ATTRIBUTES
_S_IFDIR _S_IFREG _S_IFCHR _S_IFIFO
FILE_TYPE_UNKNOWN FILE_TYPE_CHAR FILE_TYPE_PIPE
- FILE_READ_ATTRIBUTES
+ FILE_READ_ATTRIBUTES FILE_ATTRIBUTE_NORMAL
FILE_WRITE_ATTRIBUTES OPEN_EXISTING
FILE_FLAG_BACKUP_SEMANTICS
VOLUME_NAME_DOS VOLUME_NAME_NT
ERROR_FILE_NOT_FOUND ERROR_NO_MORE_FILES
diff --git a/rpython/rlib/test/test_rposix_stat.py
b/rpython/rlib/test/test_rposix_stat.py
--- a/rpython/rlib/test/test_rposix_stat.py
+++ b/rpython/rlib/test/test_rposix_stat.py
@@ -70,11 +70,11 @@
@py.test.mark.skipif(sys.platform != 'win32', reason='win32 test')
def test_stat3_ino_dev(self):
- st = rposix.stat2('C:\\')
+ st = rposix_stat.stat('C:\\')
assert st.st_dev == st.st_ino == 0
- st = rposix.stat3('C:\\')
+ st = rposix_stat.stat3('C:\\')
assert st.st_dev != 0 and st.st_ino != 0
- st2 = rposix.lstat3('C:\\')
+ st2 = rposix_stat.lstat3('C:\\')
assert (st2.st_dev, st2.st_ino) == (st.st_dev, st.st_ino)
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
