Skip to content

Fix redirect behavior of datasets.utils.download_url (#3564) #3566

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 15, 2021
Merged

Fix redirect behavior of datasets.utils.download_url (#3564) #3566

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 11 additions & 9 deletions torchvision/datasets/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,18 +67,20 @@ def check_integrity(fpath: str, md5: Optional[str] = None) -> bool:
return check_md5(fpath, md5)


def _get_redirect_url(url: str, max_hops: int = 10) -> str:
import requests

for hop in range(max_hops + 1):
response = requests.get(url)
def _get_redirect_url(url: str, max_hops: int = 3) -> str:
initial_url = url
headers = {"Method": "HEAD", "User-Agent": USER_AGENT}

if response.url == url or response.url is None:
return url
for _ in range(max_hops + 1):
with urllib.request.urlopen(urllib.request.Request(url, headers=headers)) as response:
if response.url == url or response.url is None:
return url

url = response.url
url = response.url
else:
raise RecursionError(f"Too many redirects: {max_hops + 1})")
raise RecursionError(
f"Request to {initial_url} exceeded {max_hops} redirects. The last redirect points to {url}."
)


def _get_google_drive_file_id(url: str) -> Optional[str]:
Expand Down