languages/cpython
languages/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython synced 2024-10-14 09:43:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix fallout from Anna's file -> open changes.

Browse source
This commit is contained in:
Guido van Rossum 2006-08-24 04:03:53 +00:00
parent b053cd8f40
commit 8f78fe9a10
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Lib/tarfile.py
View file

@ -65,6 +65,8 @@
# from tarfile import *
__all__ = ["TarFile", "TarInfo", "is_tarfile", "TarError"]
from __builtin__ import open as _open # Since 'open' is TarFile.open
#---------------------------------------------------------
# tar constants
#---------------------------------------------------------
@ -934,7 +936,7 @@ def __init__(self, name=None, mode="r", fileobj=None):
self.mode = {"r": "rb", "a": "r+b", "w": "wb"}[mode]
if not fileobj:
fileobj = open(self.name, self.mode)
fileobj = _open(self.name, self.mode)
self._extfileobj = False
else:
if self.name is None and hasattr(fileobj, "name"):
@ -1083,7 +1085,7 @@ def gzopen(cls, name, mode="r", fileobj=None, compresslevel=9):
tarname = pre + ext
if fileobj is None:
fileobj = open(name, mode + "b")
fileobj = _open(name, mode + "b")
if mode != "r":
name = tarname
@ -1355,7 +1357,7 @@ def add(self, name, arcname=None, recursive=True):
# Append the tar header and data to the archive.
if tarinfo.isreg():
f = open(name, "rb")
f = _open(name, "rb")
self.addfile(tarinfo, f)
f.close()
@ -1617,7 +1619,7 @@ def makefile(self, tarinfo, targetpath):
"""Make a file called targetpath.
"""
source = self.extractfile(tarinfo)
target = open(targetpath, "wb")
target = _open(targetpath, "wb")
copyfileobj(source, target)
source.close()
target.close()