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
ae557d76
Commit
ae557d76
authored
Feb 12, 2012
by
Nadeem Vawda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix seekable() in BZ2File and LZMAFile to check whether the underlying file supports seek().
parent
d7e5c6ed
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
28 additions
and
4 deletions
+28
-4
Lib/bz2.py
Lib/bz2.py
+5
-2
Lib/lzma.py
Lib/lzma.py
+5
-2
Lib/test/test_bz2.py
Lib/test/test_bz2.py
+9
-0
Lib/test/test_lzma.py
Lib/test/test_lzma.py
+9
-0
No files found.
Lib/bz2.py
View file @
ae557d76
...
...
@@ -138,7 +138,7 @@ class BZ2File(io.BufferedIOBase):
def
seekable
(
self
):
"""Return whether the file supports seeking."""
return
self
.
readable
()
return
self
.
readable
()
and
self
.
_fp
.
seekable
()
def
readable
(
self
):
"""Return whether the file was opened for reading."""
...
...
@@ -165,9 +165,12 @@ class BZ2File(io.BufferedIOBase):
raise
io
.
UnsupportedOperation
(
"File not open for writing"
)
def
_check_can_seek
(
self
):
if
not
self
.
seek
able
():
if
not
self
.
read
able
():
raise
io
.
UnsupportedOperation
(
"Seeking is only supported "
"on files open for reading"
)
if
not
self
.
_fp
.
seekable
():
raise
io
.
UnsupportedOperation
(
"The underlying file object "
"does not support seeking"
)
# Fill the readahead buffer if it is empty. Returns False on EOF.
def
_fill_buffer
(
self
):
...
...
Lib/lzma.py
View file @
ae557d76
...
...
@@ -165,7 +165,7 @@ class LZMAFile(io.BufferedIOBase):
def
seekable
(
self
):
"""Return whether the file supports seeking."""
return
self
.
readable
()
return
self
.
readable
()
and
self
.
_fp
.
seekable
()
def
readable
(
self
):
"""Return whether the file was opened for reading."""
...
...
@@ -192,9 +192,12 @@ class LZMAFile(io.BufferedIOBase):
raise
io
.
UnsupportedOperation
(
"File not open for writing"
)
def
_check_can_seek
(
self
):
if
not
self
.
seek
able
():
if
not
self
.
read
able
():
raise
io
.
UnsupportedOperation
(
"Seeking is only supported "
"on files open for reading"
)
if
not
self
.
_fp
.
seekable
():
raise
io
.
UnsupportedOperation
(
"The underlying file object "
"does not support seeking"
)
# Fill the readahead buffer if it is empty. Returns False on EOF.
def
_fill_buffer
(
self
):
...
...
Lib/test/test_bz2.py
View file @
ae557d76
...
...
@@ -372,6 +372,15 @@ class BZ2FileTest(BaseTest):
bz2f
.
close
()
self
.
assertRaises
(
ValueError
,
bz2f
.
seekable
)
src
=
BytesIO
(
self
.
DATA
)
src
.
seekable
=
lambda
:
False
bz2f
=
BZ2File
(
fileobj
=
src
)
try
:
self
.
assertFalse
(
bz2f
.
seekable
())
finally
:
bz2f
.
close
()
self
.
assertRaises
(
ValueError
,
bz2f
.
seekable
)
def
testReadable
(
self
):
bz2f
=
BZ2File
(
fileobj
=
BytesIO
(
self
.
DATA
))
try
:
...
...
Lib/test/test_lzma.py
View file @
ae557d76
...
...
@@ -525,6 +525,15 @@ class FileTestCase(unittest.TestCase):
f
.
close
()
self
.
assertRaises
(
ValueError
,
f
.
seekable
)
src
=
BytesIO
(
COMPRESSED_XZ
)
src
.
seekable
=
lambda
:
False
f
=
LZMAFile
(
fileobj
=
src
)
try
:
self
.
assertFalse
(
f
.
seekable
())
finally
:
f
.
close
()
self
.
assertRaises
(
ValueError
,
f
.
seekable
)
def
test_readable
(
self
):
f
=
LZMAFile
(
fileobj
=
BytesIO
(
COMPRESSED_XZ
))
try
:
...
...
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