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
103e8113
Commit
103e8113
authored
Jun 20, 2012
by
Nadeem Vawda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix GzipFile's handling of filenames given as bytes objects.
parent
f29ec4b0
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
20 additions
and
4 deletions
+20
-4
Lib/gzip.py
Lib/gzip.py
+4
-4
Lib/test/test_gzip.py
Lib/test/test_gzip.py
+14
-0
Misc/NEWS
Misc/NEWS
+2
-0
No files found.
Lib/gzip.py
View file @
103e8113
...
...
@@ -159,9 +159,8 @@ class GzipFile(io.BufferedIOBase):
if
fileobj
is
None
:
fileobj
=
self
.
myfileobj
=
builtins
.
open
(
filename
,
mode
or
'rb'
)
if
filename
is
None
:
if
hasattr
(
fileobj
,
'name'
)
and
isinstance
(
fileobj
.
name
,
str
):
filename
=
fileobj
.
name
else
:
filename
=
getattr
(
fileobj
,
'name'
,
''
)
if
not
isinstance
(
filename
,
(
str
,
bytes
)):
filename
=
''
if
mode
is
None
:
if
hasattr
(
fileobj
,
'mode'
):
mode
=
fileobj
.
mode
...
...
@@ -236,6 +235,7 @@ class GzipFile(io.BufferedIOBase):
# RFC 1952 requires the FNAME field to be Latin-1. Do not
# include filenames that cannot be represented that way.
fname
=
os
.
path
.
basename
(
self
.
name
)
if
not
isinstance
(
fname
,
bytes
):
fname
=
fname
.
encode
(
'latin-1'
)
if
fname
.
endswith
(
b'.gz'
):
fname
=
fname
[:
-
3
]
...
...
Lib/test/test_gzip.py
View file @
103e8113
...
...
@@ -331,6 +331,20 @@ class TestGzip(unittest.TestCase):
with
gzip
.
GzipFile
(
fileobj
=
f
,
mode
=
"w"
)
as
g
:
pass
def
test_bytes_filename
(
self
):
str_filename
=
self
.
filename
try
:
bytes_filename
=
str_filename
.
encode
(
"ascii"
)
except
UnicodeEncodeError
:
self
.
skipTest
(
"Temporary file name needs to be ASCII"
)
with
gzip
.
GzipFile
(
bytes_filename
,
"wb"
)
as
f
:
f
.
write
(
data1
*
50
)
with
gzip
.
GzipFile
(
bytes_filename
,
"rb"
)
as
f
:
self
.
assertEqual
(
f
.
read
(),
data1
*
50
)
# Sanity check that we are actually operating on the right file.
with
gzip
.
GzipFile
(
str_filename
,
"rb"
)
as
f
:
self
.
assertEqual
(
f
.
read
(),
data1
*
50
)
# Testing compress/decompress shortcut functions
def
test_compress
(
self
):
...
...
Misc/NEWS
View file @
103e8113
...
...
@@ -70,6 +70,8 @@ Core and Builtins
Library
-------
- Fix GzipFile's handling of filenames given as bytes objects.
- Issue #15101: Make pool finalizer avoid joining current thread.
- Issue #15036: Mailbox no longer throws an error if a flush is done
...
...
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