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
c6cd5a3a
Commit
c6cd5a3a
authored
Oct 12, 2014
by
Serhiy Storchaka
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Issue #13664: GzipFile now supports non-ascii Unicode filenames.
parent
05cfcc6f
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
23 additions
and
3 deletions
+23
-3
Lib/gzip.py
Lib/gzip.py
+10
-3
Lib/test/test_gzip.py
Lib/test/test_gzip.py
+11
-0
Misc/NEWS
Misc/NEWS
+2
-0
No files found.
Lib/gzip.py
View file @
c6cd5a3a
...
...
@@ -164,9 +164,16 @@ class GzipFile(io.BufferedIOBase):
def
_write_gzip_header
(
self
):
self
.
fileobj
.
write
(
'
\
037
\
213
'
)
# magic header
self
.
fileobj
.
write
(
'
\
010
'
)
# compression method
fname
=
os
.
path
.
basename
(
self
.
name
)
if
fname
.
endswith
(
".gz"
):
fname
=
fname
[:
-
3
]
try
:
# 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
,
str
):
fname
=
fname
.
encode
(
'latin-1'
)
if
fname
.
endswith
(
'.gz'
):
fname
=
fname
[:
-
3
]
except
UnicodeEncodeError
:
fname
=
''
flags
=
0
if
fname
:
flags
=
FNAME
...
...
Lib/test/test_gzip.py
View file @
c6cd5a3a
...
...
@@ -30,6 +30,17 @@ class TestGzip(unittest.TestCase):
def
tearDown
(
self
):
test_support
.
unlink
(
self
.
filename
)
@
test_support
.
requires_unicode
def
test_unicode_filename
(
self
):
unicode_filename
=
test_support
.
TESTFN_UNICODE
with
gzip
.
GzipFile
(
unicode_filename
,
"wb"
)
as
f
:
f
.
write
(
data1
*
50
)
with
gzip
.
GzipFile
(
unicode_filename
,
"rb"
)
as
f
:
self
.
assertEqual
(
f
.
read
(),
data1
*
50
)
# Sanity check that we are actually operating on the right file.
with
open
(
unicode_filename
,
'rb'
)
as
fobj
,
\
gzip
.
GzipFile
(
fileobj
=
fobj
,
mode
=
"rb"
)
as
f
:
self
.
assertEqual
(
f
.
read
(),
data1
*
50
)
def
test_write
(
self
):
with
gzip
.
GzipFile
(
self
.
filename
,
'wb'
)
as
f
:
...
...
Misc/NEWS
View file @
c6cd5a3a
...
...
@@ -37,6 +37,8 @@ Core and Builtins
Library
-------
-
Issue
#
13664
:
GzipFile
now
supports
non
-
ascii
Unicode
filenames
.
-
Issue
#
13096
:
Fixed
segfault
in
CTypes
POINTER
handling
of
large
values
.
...
...
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