diff options
Diffstat (limited to 'Lib/tarfile.py')
| -rw-r--r-- | Lib/tarfile.py | 41 |
1 files changed, 12 insertions, 29 deletions
diff --git a/Lib/tarfile.py b/Lib/tarfile.py index 893d486..54a2606 100644 --- a/Lib/tarfile.py +++ b/Lib/tarfile.py @@ -330,11 +330,6 @@ def filemode(mode): perm.append("-") return "".join(perm) -if os.sep != "/": - normpath = lambda path: os.path.normpath(path).replace(os.sep, "/") -else: - normpath = os.path.normpath - class TarError(Exception): """Base exception.""" pass @@ -956,7 +951,7 @@ class TarInfo(object): """Return the TarInfo's attributes as a dictionary. """ info = { - "name": normpath(self.name), + "name": self.name, "mode": self.mode & 07777, "uid": self.uid, "gid": self.gid, @@ -964,7 +959,7 @@ class TarInfo(object): "mtime": self.mtime, "chksum": self.chksum, "type": self.type, - "linkname": normpath(self.linkname) if self.linkname else "", + "linkname": self.linkname, "uname": self.uname, "gname": self.gname, "devmajor": self.devmajor, @@ -1815,10 +1810,9 @@ class TarFile(object): # Absolute paths are turned to relative paths. if arcname is None: arcname = name - arcname = normpath(arcname) drv, arcname = os.path.splitdrive(arcname) - while arcname[0:1] == "/": - arcname = arcname[1:] + arcname = arcname.replace(os.sep, "/") + arcname = arcname.lstrip("/") # Now, fill the TarInfo object with # information specific for the file. @@ -1947,16 +1941,6 @@ class TarFile(object): self._dbg(2, "tarfile: Skipped %r" % name) return - # Special case: The user wants to add the current - # working directory. - if name == ".": - if recursive: - if arcname == ".": - arcname = "" - for f in os.listdir(name): - self.add(f, os.path.join(arcname, f), recursive, exclude) - return - self._dbg(1, name) # Create a TarInfo object from the file. @@ -2123,9 +2107,8 @@ class TarFile(object): # Fetch the TarInfo object for the given name # and build the destination pathname, replacing # forward slashes to platform specific separators. - if targetpath[-1:] == "/": - targetpath = targetpath[:-1] - targetpath = os.path.normpath(targetpath) + targetpath = targetpath.rstrip("/") + targetpath = targetpath.replace("/", os.sep) # Create all upper directories. upperdirs = os.path.dirname(targetpath) @@ -2220,23 +2203,23 @@ class TarFile(object): (platform limitation), we try to make a copy of the referenced file instead of a link. """ - linkpath = tarinfo.linkname try: if tarinfo.issym(): - os.symlink(linkpath, targetpath) + os.symlink(tarinfo.linkname, targetpath) else: # See extract(). os.link(tarinfo._link_target, targetpath) except AttributeError: if tarinfo.issym(): - linkpath = os.path.join(os.path.dirname(tarinfo.name), - linkpath) - linkpath = normpath(linkpath) + linkpath = os.path.dirname(tarinfo.name) + "/" + \ + tarinfo.linkname + else: + linkpath = tarinfo.linkname try: self._extract_member(self.getmember(linkpath), targetpath) except (EnvironmentError, KeyError), e: - linkpath = os.path.normpath(linkpath) + linkpath = linkpath.replace("/", os.sep) try: shutil.copy2(linkpath, targetpath) except EnvironmentError, e: |