FWGS/waf
2
0
Fork 0
mirror of https://gitlab.com/ita1024/waf.git synced 2025-01-06 00:15:30 +01:00
Code Issues Projects Releases Wiki Activity

cleanup

Browse Source
This commit is contained in:
Thomas Nagy 2012-05-21 20:23:43 +02:00
parent 2e19a6bb28
commit fb1addeaf2
1 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
waflib/Utils.py
View File

@ -193,10 +193,11 @@ def h_file(fname):
if hasattr(os, 'O_NOINHERIT'):
def readf_win32(f, m='r'):
mod = 'b' in m and os.O_BINARY or os.O_TEXT
fd = os.open(f, mod | os.O_RDONLY | os.O_NOINHERIT)
if fd == -1:
raise OSError('Cannot read from %r' % f)
f = os.fdopen(fd, flags)
try:
fd = os.open(f, mod | os.O_RDONLY | os.O_NOINHERIT)
except OSError:
raise IOError('Cannot read from %r' % f)
f = os.fdopen(fd, m)
try:
txt = f.read()
finally:
@ -205,19 +206,26 @@ if hasattr(os, 'O_NOINHERIT'):
def writef_win32(f, data, m='w'):
mod = 'b' in m and os.O_BINARY or os.O_TEXT
fd = os.open(f, mod | os.O_RDWR | os.O_NOINHERIT | os.O_CREAT)
if fd == -1:
raise OSError('Cannot write to %r' % f)
f = os.fdopen(fd, flags)
if 'r' in m:
mod |= os.O_RDONLY
mod |= os.O_WRONLY
if '+' in m:
mod |= os.O_RDWR
try:
fd = os.open(f, mod | os.O_NOINHERIT | os.O_CREAT)
except OSError:
raise IOError('Cannot write to %r' % f)
f = os.fdopen(fd, m)
try:
f.write(data)
finally:
f.close()
def h_file_win32(fname):
fd = os.open(fname, os.O_BINARY | os.O_RDONLY | os.O_NOINHERIT)
if fd == -1:
raise OSError('Cannot read from %r' % fname)
try:
fd = os.open(fname, os.O_BINARY | os.O_RDONLY | os.O_NOINHERIT)
except OSError:
raise IOError('Cannot read from %r' % fname)
f = os.fdopen(fd, 'rb')
m = md5()
try:
@ -283,7 +291,7 @@ if is_win32:
s += os.sep
if not os.path.isdir(s):
e = OSError()
e = OSError('%s is not a directory' % s)
e.errno = errno.ENOENT
raise e
return os.listdir(s)