Skip to content

Commit

Permalink
Merge pull request #5863 from benoit-pierre/drop_py25_workaround
Browse files Browse the repository at this point in the history
drop workaround for Python<=2.5
  • Loading branch information
pradyunsg committed Oct 9, 2018
2 parents 3832020 + 0a58159 commit 35f0983
Show file tree
Hide file tree
Showing 4 changed files with 0 additions and 15 deletions.
4 changes: 0 additions & 4 deletions src/pip/_internal/utils/misc.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 0 additions & 4 deletions tests/data/packages/README.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Binary file removed tests/data/packages/paxpkg.tar.bz2
Binary file not shown.
7 changes: 0 additions & 7 deletions tests/functional/test_install.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 35f0983

Please sign in to comment.