From 99eff1755442202e1a01861c1b718d28b6db404c Mon Sep 17 00:00:00 2001 From: Romain Bignon Date: Tue, 21 Jun 2011 13:05:19 +0200 Subject: [PATCH] fix handle of urls (closes #675) --- weboob/backends/redmine/browser.py | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/weboob/backends/redmine/browser.py b/weboob/backends/redmine/browser.py index 1cbd3f27..0e7d7656 100644 --- a/weboob/backends/redmine/browser.py +++ b/weboob/backends/redmine/browser.py @@ -34,11 +34,13 @@ __all__ = ['RedmineBrowser'] # Browser class RedmineBrowser(BaseBrowser): ENCODING = 'utf-8' - PAGES = {'%s/': IndexPage, - '%s/login': LoginPage, - '%s/my/page': MyPage, - '%s/projects/([\w-]+)/wiki/([^\/]+)/edit': WikiEditPage, - '%s/projects/[\w-]+/wiki/[^\/]*': WikiPage, + PAGES = {'https?://[^/]+/': IndexPage, + 'https?://[^/]+/login': LoginPage, + # compatibility with redmine 0.9 + 'https?://[^/]+/login\?back_url.*': MyPage, + 'https?://[^/]+/my/page': MyPage, + 'https?://[^/]+/projects/([\w-]+)/wiki/([^\/]+)/edit': WikiEditPage, + 'https?://[^/]+/projects/[\w-]+/wiki/[^\/]*': WikiPage, } def __init__(self, url, *args, **kwargs): @@ -49,12 +51,6 @@ class RedmineBrowser(BaseBrowser): self.BASEPATH = v.path if self.BASEPATH.endswith('/'): self.BASEPATH = self.BASEPATH[:-1] - - prefix = '%s://%s%s' % (self.PROTOCOL, self.DOMAIN, self.BASEPATH) - - self.PAGES = {} - for key, value in RedmineBrowser.PAGES.iteritems(): - self.PAGES[key % prefix] = value BaseBrowser.__init__(self, *args, **kwargs) def is_logged(self):