From: Lars Gustäbel <lars@gustaebel.de>
Date: Thu, 29 Oct 2009 09:15:00 +0000 (+0000)
Subject: Issue #4750: Store the basename of the original filename in
X-Git-Tag: v2.7a1~203
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8c06ccc058e1fb5d120da8e0b8ce5fc3a5abb6b6;p=python

Issue #4750: Store the basename of the original filename in
the gzip FNAME header as required by RFC 1952.
---

diff --git a/Lib/gzip.py b/Lib/gzip.py
index 9605d5d097..8d71cd383f 100644
--- a/Lib/gzip.py
+++ b/Lib/gzip.py
@@ -5,7 +5,7 @@ but random access is not allowed."""
 
 # based on Andrew Kuchling's minigzip.py distributed with the zlib module
 
-import struct, sys, time
+import struct, sys, time, os
 import zlib
 import __builtin__
 
@@ -143,7 +143,7 @@ class GzipFile:
     def _write_gzip_header(self):
         self.fileobj.write('\037\213')             # magic header
         self.fileobj.write('\010')                 # compression method
-        fname = self.name
+        fname = os.path.basename(self.name)
         if fname.endswith(".gz"):
             fname = fname[:-3]
         flags = 0
diff --git a/Misc/NEWS b/Misc/NEWS
index 24cb7b3b37..2e2f822b12 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -427,6 +427,9 @@ Core and Builtins
 Library
 -------
 
+- Issue #4750: Store the basename of the original filename in the gzip FNAME
+  header as required by RFC 1952.
+
 - Issue #1180: Added a new global option to ignore ~/.pydistutils.cfg in
   Distutils.