diff options
author | Serhiy Storchaka <storchaka@gmail.com> | 2017-01-13 13:25:24 +0200 |
---|---|---|
committer | Serhiy Storchaka <storchaka@gmail.com> | 2017-01-13 13:25:24 +0200 |
commit | c3e70c9df5ac47a4e611afdc6a4ea1e621d2d0aa (patch) | |
tree | 1175d5e2630c9dd33965445ff6aa3df1d322a2e6 /Lib | |
parent | b85c5ca381be8c11d5217cf20d46ce45dc4164cf (diff) | |
download | cpython-c3e70c9df5ac47a4e611afdc6a4ea1e621d2d0aa.tar.gz |
Issue #29210: Removed support of deprecated argument "exclude" in
tarfile.TarFile.add().
Diffstat (limited to 'Lib')
-rwxr-xr-x | Lib/tarfile.py | 16 | ||||
-rw-r--r-- | Lib/test/test_tarfile.py | 27 |
2 files changed, 3 insertions, 40 deletions
diff --git a/Lib/tarfile.py b/Lib/tarfile.py index 5d4c86ce36..c3777ff2dd 100755 --- a/Lib/tarfile.py +++ b/Lib/tarfile.py @@ -1897,13 +1897,12 @@ class TarFile(object): _safe_print("link to " + tarinfo.linkname) print() - def add(self, name, arcname=None, recursive=True, exclude=None, *, filter=None): + def add(self, name, arcname=None, recursive=True, *, filter=None): """Add the file `name' to the archive. `name' may be any type of file (directory, fifo, symbolic link, etc.). If given, `arcname' specifies an alternative name for the file in the archive. Directories are added recursively by default. This can be avoided by - setting `recursive' to False. `exclude' is a function that should - return True for each filename to be excluded. `filter' is a function + setting `recursive' to False. `filter' is a function that expects a TarInfo object argument and returns the changed TarInfo object, if it returns None the TarInfo object will be excluded from the archive. @@ -1913,15 +1912,6 @@ class TarFile(object): if arcname is None: arcname = name - # Exclude pathnames. - if exclude is not None: - import warnings - warnings.warn("use the filter argument instead", - DeprecationWarning, 2) - if exclude(name): - self._dbg(2, "tarfile: Excluded %r" % name) - return - # Skip if somebody tries to archive the archive... if self.name is not None and os.path.abspath(name) == self.name: self._dbg(2, "tarfile: Skipped %r" % name) @@ -1953,7 +1943,7 @@ class TarFile(object): if recursive: for f in os.listdir(name): self.add(os.path.join(name, f), os.path.join(arcname, f), - recursive, exclude, filter=filter) + recursive, filter=filter) else: self.addfile(tarinfo) diff --git a/Lib/test/test_tarfile.py b/Lib/test/test_tarfile.py index 619cbc03b2..3c51c04c58 100644 --- a/Lib/test/test_tarfile.py +++ b/Lib/test/test_tarfile.py @@ -1145,33 +1145,6 @@ class WriteTest(WriteTestBase, unittest.TestCase): finally: tar.close() - def test_exclude(self): - tempdir = os.path.join(TEMPDIR, "exclude") - os.mkdir(tempdir) - try: - for name in ("foo", "bar", "baz"): - name = os.path.join(tempdir, name) - support.create_empty_file(name) - - exclude = os.path.isfile - - tar = tarfile.open(tmpname, self.mode, encoding="iso8859-1") - try: - with support.check_warnings(("use the filter argument", - DeprecationWarning)): - tar.add(tempdir, arcname="empty_dir", exclude=exclude) - finally: - tar.close() - - tar = tarfile.open(tmpname, "r") - try: - self.assertEqual(len(tar.getmembers()), 1) - self.assertEqual(tar.getnames()[0], "empty_dir") - finally: - tar.close() - finally: - support.rmtree(tempdir) - def test_filter(self): tempdir = os.path.join(TEMPDIR, "filter") os.mkdir(tempdir) |