From e88adc7e5b32fae6208bbf2dae95f6542d7ca10d Mon Sep 17 00:00:00 2001 From: Neil Williams Date: Wed, 24 Aug 2011 19:36:07 -0700 Subject: [PATCH] Don't die if a url fails to parse. --- r2/r2/lib/utils/utils.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/r2/r2/lib/utils/utils.py b/r2/r2/lib/utils/utils.py index 23d56b961..b317b657d 100644 --- a/r2/r2/lib/utils/utils.py +++ b/r2/r2/lib/utils/utils.py @@ -275,11 +275,14 @@ def sanitize_url(url, require_scheme = False): if url.lower() == 'self': return url - u = urlparse(url) - # first pass: make sure a scheme has been specified - if not require_scheme and not u.scheme: - url = 'http://' + url + try: u = urlparse(url) + # first pass: make sure a scheme has been specified + if not require_scheme and not u.scheme: + url = 'http://' + url + u = urlparse(url) + except ValueError: + return if u.scheme and u.scheme in valid_schemes: # if there is a scheme and no hostname, it is a bad url.