Merged revisions 75941 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
................
r75941 | mark.dickinson | 2009-10-29 09:58:06 +0000 (Thu, 29 Oct 2009) | 11 lines
Merged revisions 75939 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r75939 | mark.dickinson | 2009-10-29 09:46:04 +0000 (Thu, 29 Oct 2009) | 5 lines
Roll back ill-considered attempts to fix printf specifier mismatch for off_t.
The sensible solution seems to be to implement %lld for PyString_FromFormat(V)
and PyErr_Format. See issue #7228.
........
................
diff --git a/Modules/_io/bufferedio.c b/Modules/_io/bufferedio.c
index e3deb10..d8b6471 100644
--- a/Modules/_io/bufferedio.c
+++ b/Modules/_io/bufferedio.c
@@ -580,8 +580,7 @@
if (n < 0) {
if (!PyErr_Occurred())
PyErr_Format(PyExc_IOError,
- "Raw stream returned invalid position %" PY_PRIdOFF,
- (PY_OFF_T_COMPAT)n);
+ "Raw stream returned invalid position %zd", n);
return -1;
}
self->abs_pos = n;
@@ -613,8 +612,7 @@
if (n < 0) {
if (!PyErr_Occurred())
PyErr_Format(PyExc_IOError,
- "Raw stream returned invalid position %" PY_PRIdOFF,
- (PY_OFF_T_COMPAT)n);
+ "Raw stream returned invalid position %zd", n);
return -1;
}
self->abs_pos = n;