Patch #1647484: Renamed GzipFile's filename attribute to name. The · python/cpython@5b1a785

GitHub

@@ -106,7 +106,7 @@ def __init__(self, filename=None, mode=None,

106106self._new_member=True

107107self.extrabuf=""

108108self.extrasize=0

109-self.filename=filename

109+self.name=filename

110110# Starts small, scales exponentially

111111self.min_readsize=100

112112@@ -127,14 +127,20 @@ def __init__(self, filename=None, mode=None,

127127ifself.mode==WRITE:

128128self._write_gzip_header()

129129130+@property

131+deffilename(self):

132+importwarnings

133+warnings.warn("use the name attribute", DeprecationWarning)

134+ifself.mode==WRITEandself.name[-3:] !=".gz":

135+returnself.name+".gz"

136+returnself.name

137+130138def__repr__(self):

131139s=repr(self.fileobj)

132140return'<gzip '+s[1:-1] +' '+hex(id(self)) +'>'

133141134142def_init_write(self, filename):

135-iffilename[-3:] !='.gz':

136-filename=filename+'.gz'

137-self.filename=filename

143+self.name=filename

138144self.crc=zlib.crc32("")

139145self.size=0

140146self.writebuf= []

@@ -143,16 +149,15 @@ def _init_write(self, filename):

143149def_write_gzip_header(self):

144150self.fileobj.write('\037\213') # magic header

145151self.fileobj.write('\010') # compression method

146-fname=self.filename[:-3]

147152flags=0

148-iffname:

153+ifself.name:

149154flags=FNAME

150155self.fileobj.write(chr(flags))

151156write32u(self.fileobj, long(time.time()))

152157self.fileobj.write('\002')

153158self.fileobj.write('\377')

154-iffname:

155-self.fileobj.write(fname+'\000')

159+ifself.name:

160+self.fileobj.write(self.name+'\000')

156161157162def_init_read(self):

158163self.crc=zlib.crc32("")