Author: Timo Paulssen <timona...@perpetuum-immobile.de>
Branch:
Changeset: r48468:c0c84696f00b
Date: 2011-10-26 03:01 +0200
http://bitbucket.org/pypy/pypy/changeset/c0c84696f00b/
Log: Merge heads
diff --git a/pypy/rpython/module/ll_os.py b/pypy/rpython/module/ll_os.py
--- a/pypy/rpython/module/ll_os.py
+++ b/pypy/rpython/module/ll_os.py
@@ -959,8 +959,6 @@
os_ftruncate(rffi.cast(rffi.INT, fd),
rffi.cast(rffi.LONGLONG, length)))
if res < 0:
- # Note: for consistency we raise OSError, but CPython
- # raises IOError here
raise OSError(rposix.get_errno(), "os_ftruncate failed")
return extdef([int, r_longlong], s_None,
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
http://mail.python.org/mailman/listinfo/pypy-commit
