diff options
| author | Pradyun Gedam <pradyunsg@gmail.com> | 2018-10-09 14:34:49 +0530 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-09 14:34:49 +0530 |
| commit | 35f098363983baebc13ffb84ded80b816d8fb246 (patch) | |
| tree | 6426093132e11897430b261b810d07787c796c64 | |
| parent | 3832020a1f4160d6c78097ab25509035c02d32cb (diff) | |
| parent | 0a58159571a47d4839216ff96487bd23aa427da1 (diff) | |
| download | pip-35f098363983baebc13ffb84ded80b816d8fb246.tar.gz | |
Merge pull request #5863 from benoit-pierre/drop_py25_workaround
drop workaround for Python<=2.5
| -rw-r--r-- | src/pip/_internal/utils/misc.py | 4 | ||||
| -rw-r--r-- | tests/data/packages/README.txt | 4 | ||||
| -rw-r--r-- | tests/data/packages/paxpkg.tar.bz2 | bin | 1094 -> 0 bytes | |||
| -rw-r--r-- | tests/functional/test_install.py | 7 |
4 files changed, 0 insertions, 15 deletions
diff --git a/src/pip/_internal/utils/misc.py b/src/pip/_internal/utils/misc.py index 84a421fe4..6998e16f0 100644 --- a/src/pip/_internal/utils/misc.py +++ b/src/pip/_internal/utils/misc.py @@ -520,15 +520,11 @@ def untar_file(filename, location): mode = 'r:*' tar = tarfile.open(filename, mode) try: - # note: python<=2.5 doesn't seem to know about pax headers, filter them leading = has_leading_dir([ member.name for member in tar.getmembers() - if member.name != 'pax_global_header' ]) for member in tar.getmembers(): fn = member.name - if fn == 'pax_global_header': - continue if leading: fn = split_leading_dir(fn)[1] path = os.path.join(location, fn) diff --git a/tests/data/packages/README.txt b/tests/data/packages/README.txt index b2f61b513..a7fccc5bb 100644 --- a/tests/data/packages/README.txt +++ b/tests/data/packages/README.txt @@ -59,10 +59,6 @@ parent/child-0.1.tar.gz The parent-0.1.tar.gz and child-0.1.tar.gz packages are used by test_uninstall:test_uninstall_overlapping_package. -paxpkg.tar.bz2 --------------- -tar with pax headers - pkgwithmpkg-1.0.tar.gz; pkgwithmpkg-1.0-py2.7-macosx10.7.mpkg.zip ----------------------------------------------------------------- used for osx test case (tests.test_finder:test_no_mpkg) diff --git a/tests/data/packages/paxpkg.tar.bz2 b/tests/data/packages/paxpkg.tar.bz2 Binary files differdeleted file mode 100644 index d4fe6f4a9..000000000 --- a/tests/data/packages/paxpkg.tar.bz2 +++ /dev/null diff --git a/tests/functional/test_install.py b/tests/functional/test_install.py index 1be8e10e3..3cbc2fe96 100644 --- a/tests/functional/test_install.py +++ b/tests/functional/test_install.py @@ -522,13 +522,6 @@ def test_install_global_option(script): assert '0.1\n' in result.stdout -def test_install_with_pax_header(script, data): - """ - test installing from a tarball with pax header for python<2.6 - """ - script.pip('install', 'paxpkg.tar.bz2', cwd=data.packages) - - def test_install_with_hacked_egg_info(script, data): """ test installing a package which defines its own egg_info class |