From 2c6d5d4e706f9d11ecbc8e0639c69a4ea933ada6 Mon Sep 17 00:00:00 2001 From: Laurent Bachelier Date: Fri, 22 Apr 2011 10:37:30 +0200 Subject: [PATCH] Fix previous commit on domain checking of id2url * the condition on empty self.DOMAIN didn't work * it introduced a regression as subdomains were accepted by the old code --- weboob/tools/browser/decorators.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/weboob/tools/browser/decorators.py b/weboob/tools/browser/decorators.py index 9461026a..436f38f3 100644 --- a/weboob/tools/browser/decorators.py +++ b/weboob/tools/browser/decorators.py @@ -55,7 +55,8 @@ def id2url(id2url): def inner(self, *args, **kwargs): arg = unicode(args[0]) if arg.startswith('http://') or arg.startswith('https://'): - if self.DOMAIN and self.DOMAIN == urlsplit(arg).netloc: + domain = urlsplit(arg).netloc + if not self.DOMAIN or self.DOMAIN == domain or domain.endswith('.'+self.DOMAIN): url = arg else: return None