From 1ebd4d1fc43e664bdf6c697b41465939d598a18c Mon Sep 17 00:00:00 2001 From: Bastian Kleineidam Date: Tue, 21 Dec 2010 20:55:35 +0100 Subject: [PATCH] Simplify code. --- linkcheck/checker/internpaturl.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/linkcheck/checker/internpaturl.py b/linkcheck/checker/internpaturl.py index 6bd85816..96e4ef96 100644 --- a/linkcheck/checker/internpaturl.py +++ b/linkcheck/checker/internpaturl.py @@ -40,6 +40,9 @@ class InternPatternUrl (urlbase.UrlBase): scheme = parts[0] domain = parts[1] domain, is_idn = urlutil.idna_encode(domain) + # allow redirection www.example.com -> example.com and vice versa + if domain.startswith('www.'): + domain = domain[5:] if not (domain and scheme): return None path = urlutil.splitparams(parts[2])[0] @@ -50,8 +53,5 @@ class InternPatternUrl (urlbase.UrlBase): args = list(re.escape(x) for x in (scheme, domain, path)) if args[0] in ('http', 'https'): args[0] = 'https?' - # allow redirection www.example.com -> example.com and vice versa - if args[1].startswith('www\\.'): - args[1] = args[1][5:] args[1] = r"(www\.|)%s" % args[1] return "%s://%s%s" % tuple(args)