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
d7664dee
Commit
d7664dee
authored
Jan 19, 2012
by
Nadeem Vawda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Issue #13781: Fix GzipFile to work with os.fdopen()'d file objects.
parent
e09bc1e8
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
19 additions
and
2 deletions
+19
-2
Lib/gzip.py
Lib/gzip.py
+6
-2
Lib/test/test_gzip.py
Lib/test/test_gzip.py
+8
-0
Misc/NEWS
Misc/NEWS
+3
-0
Modules/posixmodule.c
Modules/posixmodule.c
+2
-0
No files found.
Lib/gzip.py
View file @
d7664dee
...
...
@@ -88,8 +88,12 @@ class GzipFile(io.BufferedIOBase):
if
fileobj
is
None
:
fileobj
=
self
.
myfileobj
=
__builtin__
.
open
(
filename
,
mode
or
'rb'
)
if
filename
is
None
:
if
hasattr
(
fileobj
,
'name'
):
filename
=
fileobj
.
name
else
:
filename
=
''
# Issue #13781: os.fdopen() creates a fileobj with a bogus name
# attribute. Avoid saving this in the gzip header's filename field.
if
hasattr
(
fileobj
,
'name'
)
and
fileobj
.
name
!=
'<fdopen>'
:
filename
=
fileobj
.
name
else
:
filename
=
''
if
mode
is
None
:
if
hasattr
(
fileobj
,
'mode'
):
mode
=
fileobj
.
mode
else
:
mode
=
'rb'
...
...
Lib/test/test_gzip.py
View file @
d7664dee
...
...
@@ -274,6 +274,14 @@ class TestGzip(unittest.TestCase):
d
=
f
.
read
()
self
.
assertEqual
(
d
,
data1
*
50
,
"Incorrect data in file"
)
def
test_fileobj_from_fdopen
(
self
):
# Issue #13781: Creating a GzipFile using a fileobj from os.fdopen()
# should not embed the fake filename "<fdopen>" in the output file.
fd
=
os
.
open
(
self
.
filename
,
os
.
O_WRONLY
|
os
.
O_CREAT
)
with
os
.
fdopen
(
fd
,
"wb"
)
as
f
:
with
gzip
.
GzipFile
(
fileobj
=
f
,
mode
=
"w"
)
as
g
:
self
.
assertEqual
(
g
.
name
,
""
)
def
test_main
(
verbose
=
None
):
test_support
.
run_unittest
(
TestGzip
)
...
...
Misc/NEWS
View file @
d7664dee
...
...
@@ -89,6 +89,9 @@ Core and Builtins
Library
-------
-
Issue
#
13781
:
Prevent
gzip
.
GzipFile
from
using
the
dummy
filename
provided
by
file
objects
opened
with
os
.
fdopen
().
-
Issue
#
13589
:
Fix
some
serialization
primitives
in
the
aifc
module
.
Patch
by
Oleg
Plakhotnyuk
.
...
...
Modules/posixmodule.c
View file @
d7664dee
...
...
@@ -6755,6 +6755,8 @@ posix_fdopen(PyObject *self, PyObject *args)
PyMem_FREE
(
mode
);
if
(
fp
==
NULL
)
return
posix_error
();
/* The dummy filename used here must be kept in sync with the value
tested against in gzip.GzipFile.__init__() - see issue #13781. */
f
=
PyFile_FromFile
(
fp
,
"<fdopen>"
,
orgmode
,
fclose
);
if
(
f
!=
NULL
)
PyFile_SetBufSize
(
f
,
bufsize
);
...
...
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