Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cpython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
cpython
Commits
056dac1b
Commit
056dac1b
authored
Nov 12, 2006
by
Martin v. Löwis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Bug #1067760: Deprecate passing floats to file.seek.
parent
065f0c8a
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
20 additions
and
4 deletions
+20
-4
Doc/lib/libstdtypes.tex
Doc/lib/libstdtypes.tex
+1
-0
Misc/NEWS
Misc/NEWS
+2
-0
Objects/fileobject.c
Objects/fileobject.c
+17
-4
No files found.
Doc/lib/libstdtypes.tex
View file @
056dac1b
...
...
@@ -1689,6 +1689,7 @@ flush the read-ahead buffer.
behavior.
Note that not all file objects are seekable.
\versionchanged
{
Passing float values as offset has been deprecated
}
[2.6]
\end{methoddesc}
\begin{methoddesc}
[file]
{
tell
}{}
...
...
Misc/NEWS
View file @
056dac1b
...
...
@@ -12,6 +12,8 @@ What's New in Python 2.6 alpha 1?
Core and builtins
-----------------
- Bug #1067760: Deprecate passing floats to file.seek.
- Bug #1591996: Correctly forward exception in instance_contains().
- Bug #1588287: fix invalid assertion for `1,2` in debug builds.
...
...
Objects/fileobject.c
View file @
056dac1b
...
...
@@ -540,7 +540,7 @@ file_seek(PyFileObject *f, PyObject *args)
int
whence
;
int
ret
;
Py_off_t
offset
;
PyObject
*
offobj
;
PyObject
*
offobj
,
*
off_index
;
if
(
f
->
f_fp
==
NULL
)
return
err_closed
();
...
...
@@ -548,12 +548,25 @@ file_seek(PyFileObject *f, PyObject *args)
whence
=
0
;
if
(
!
PyArg_ParseTuple
(
args
,
"O|i:seek"
,
&
offobj
,
&
whence
))
return
NULL
;
off_index
=
PyNumber_Index
(
offobj
);
if
(
!
off_index
)
{
if
(
!
PyFloat_Check
(
offobj
))
return
NULL
;
/* Deprecated in 2.6 */
PyErr_Clear
();
if
(
PyErr_Warn
(
PyExc_DeprecationWarning
,
"integer argument expected, got float"
))
return
NULL
;
off_index
=
offobj
;
Py_INCREF
(
offobj
);
}
#if !defined(HAVE_LARGEFILE_SUPPORT)
offset
=
PyInt_AsLong
(
off
obj
);
offset
=
PyInt_AsLong
(
off
_index
);
#else
offset
=
PyLong_Check
(
off
obj
)
?
PyLong_AsLongLong
(
off
obj
)
:
PyInt_AsLong
(
offobj
);
offset
=
PyLong_Check
(
off
_index
)
?
PyLong_AsLongLong
(
off
_index
)
:
PyInt_AsLong
(
off_index
);
#endif
Py_DECREF
(
off_index
);
if
(
PyErr_Occurred
())
return
NULL
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment