diff options
| author | Mark Dickinson <dickinsm@gmail.com> | 2009-10-29 10:01:23 +0000 |
|---|---|---|
| committer | Mark Dickinson <dickinsm@gmail.com> | 2009-10-29 10:01:23 +0000 |
| commit | 00de1bdcfcc9b5d4555c77796c0c8e93944bfb7d (patch) | |
| tree | faa2076b47a073b3a5c808048379e32f6a2a488d /Modules/_io/bufferedio.c | |
| parent | ab65087beacf28fcffc6f41a15b7f9085dcca069 (diff) | |
| download | cpython-git-00de1bdcfcc9b5d4555c77796c0c8e93944bfb7d.tar.gz | |
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.
........
................
Diffstat (limited to 'Modules/_io/bufferedio.c')
| -rw-r--r-- | Modules/_io/bufferedio.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/Modules/_io/bufferedio.c b/Modules/_io/bufferedio.c index e3deb10087..d8b6471fd7 100644 --- a/Modules/_io/bufferedio.c +++ b/Modules/_io/bufferedio.c @@ -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; |