mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-02 03:01:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 15

Merged revisions 75941 via svnmerge from

Browse source 
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.
  ........
................
This commit is contained in:
Mark Dickinson 2009-10-29 10:01:23 +00:00
parent ab65087bea
commit 00de1bdcfc
2 changed files with 9 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Modules/_io/bufferedio.c
View file

@ -580,8 +580,7 @@ _buffered_raw_tell(buffered *self)
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 @@ _buffered_raw_seek(buffered *self, Py_off_t target, int whence)
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;