From 3bc23123388c2cb62742ac58b4ed927a9c4106f4 Mon Sep 17 00:00:00 2001 From: Juke Date: Tue, 22 Feb 2011 01:06:57 +0100 Subject: [PATCH] PEP 8 fix --- weboob/backends/inrocks/__init__.py | 3 ++- weboob/backends/inrocks/backend.py | 2 ++ weboob/backends/inrocks/browser.py | 13 ++++++++++--- weboob/backends/inrocks/pages/__init__.py | 0 weboob/backends/inrocks/tools.py | 3 +++ weboob/backends/lefigaro/__init__.py | 1 + weboob/backends/lefigaro/backend.py | 2 ++ weboob/backends/lefigaro/browser.py | 13 ++++++++++--- weboob/backends/lefigaro/pages/__init__.py | 0 weboob/backends/lefigaro/tools.py | 3 +++ weboob/backends/minutes20/__init__.py | 1 + weboob/backends/minutes20/backend.py | 2 ++ weboob/backends/minutes20/browser.py | 9 +++++++++ weboob/backends/minutes20/pages/__init__.py | 0 weboob/backends/minutes20/tools.py | 3 +++ 15 files changed, 48 insertions(+), 7 deletions(-) delete mode 100644 weboob/backends/inrocks/pages/__init__.py delete mode 100644 weboob/backends/lefigaro/pages/__init__.py delete mode 100644 weboob/backends/minutes20/pages/__init__.py diff --git a/weboob/backends/inrocks/__init__.py b/weboob/backends/inrocks/__init__.py index 775a3fc9..04d48421 100644 --- a/weboob/backends/inrocks/__init__.py +++ b/weboob/backends/inrocks/__init__.py @@ -1,3 +1,4 @@ +"init of NewspaperInrocksBackend" # -*- coding: utf-8 -*- # Copyright(C) 2011 Julien Hebert @@ -16,4 +17,4 @@ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. from .backend import NewspaperInrocksBackend -__all__ = ['NewspaperInrocksBackendBackend'] +__all__ = ['NewspaperInrocksBackend'] diff --git a/weboob/backends/inrocks/backend.py b/weboob/backends/inrocks/backend.py index 0cb29265..bd2b5fc4 100644 --- a/weboob/backends/inrocks/backend.py +++ b/weboob/backends/inrocks/backend.py @@ -26,6 +26,7 @@ from .tools import url2id from .browser import NewspaperInrocksBrowser class NewspaperInrocksBackend(BaseBackend, ICapMessages): + "NewspaperInrocksBackend class" MAINTAINER = 'Julien Hebert' EMAIL = 'juke@free.fr' VERSION = '0.6' @@ -78,6 +79,7 @@ class NewspaperInrocksBackend(BaseBackend, ICapMessages): yield(thread) def fill_thread(self, thread): + "fill the thread" return self.get_thread(thread) def iter_unread_messages(self, thread=None): diff --git a/weboob/backends/inrocks/browser.py b/weboob/backends/inrocks/browser.py index 179af218..78472d43 100644 --- a/weboob/backends/inrocks/browser.py +++ b/weboob/backends/inrocks/browser.py @@ -1,3 +1,4 @@ +"browser for inrocks.fr website" # -*- coding: utf-8 -*- # Copyright(C) 2011 Julien Hebert @@ -21,15 +22,21 @@ from weboob.tools.browser import BaseBrowser class NewspaperInrocksBrowser(BaseBrowser): + "NewspaperInrocksBrowser class" PAGES = { '.*': ArticlePage, - } def is_logged(self): return False + def login(self): + pass + + def fillobj(self, obj, fields): + pass + def get_content(self, _id): - url = _id - self.location(url) + "return page article content" + self.location(_id) return self.page.get_article(_id) diff --git a/weboob/backends/inrocks/pages/__init__.py b/weboob/backends/inrocks/pages/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/weboob/backends/inrocks/tools.py b/weboob/backends/inrocks/tools.py index e0a157a2..6cc231fc 100644 --- a/weboob/backends/inrocks/tools.py +++ b/weboob/backends/inrocks/tools.py @@ -1,3 +1,4 @@ +"common tools for inrocks backend" # -*- coding: utf-8 -*- # Copyright(C) 2011 Julien Hebert @@ -18,6 +19,7 @@ import re def id2url(_id): + "return an url from an id" regexp2 = re.compile("(\w+).([0-9]+).(.*$)") match = regexp2.match(_id) if match: @@ -28,4 +30,5 @@ def id2url(_id): raise ValueError("id doesn't match") def url2id(url): + "return an id from an url" return url diff --git a/weboob/backends/lefigaro/__init__.py b/weboob/backends/lefigaro/__init__.py index f9e5c9d2..edf76566 100644 --- a/weboob/backends/lefigaro/__init__.py +++ b/weboob/backends/lefigaro/__init__.py @@ -1,3 +1,4 @@ +"NewspaperFigaroBackend init" # -*- coding: utf-8 -*- # Copyright(C) 2011 Julien Hebert diff --git a/weboob/backends/lefigaro/backend.py b/weboob/backends/lefigaro/backend.py index e48f7f6d..847c34a5 100644 --- a/weboob/backends/lefigaro/backend.py +++ b/weboob/backends/lefigaro/backend.py @@ -26,6 +26,7 @@ from .tools import url2id from .browser import NewspaperFigaroBrowser class NewspaperFigaroBackend(BaseBackend, ICapMessages): + "NewspaperFigaroBackend class" MAINTAINER = 'Julien Hebert' EMAIL = 'juke@free.fr' VERSION = '0.6' @@ -78,6 +79,7 @@ class NewspaperFigaroBackend(BaseBackend, ICapMessages): yield(thread) def fill_thread(self, thread): + "fill the thread" return self.get_thread(thread) def iter_unread_messages(self, thread=None): diff --git a/weboob/backends/lefigaro/browser.py b/weboob/backends/lefigaro/browser.py index bafc13ba..3d5d6b3a 100644 --- a/weboob/backends/lefigaro/browser.py +++ b/weboob/backends/lefigaro/browser.py @@ -1,3 +1,4 @@ +"browser for lefigaro website" # -*- coding: utf-8 -*- # Copyright(C) 2011 Julien Hebert @@ -22,6 +23,7 @@ from weboob.tools.browser import BaseBrowser class NewspaperFigaroBrowser(BaseBrowser): + "NewspaperFigaroBrowser class" PAGES = { "http://www.lefigaro.fr/flash-actu/([0-9][0-9][0-9][0-9])/([0-9][0-9])/([0-9][0-9])/(.*$)": FlashActuPage, "http://www.lefigaro.fr/flash-sport/([0-9][0-9][0-9][0-9])/([0-9][0-9])/([0-9][0-9])/(.*$)": FlashActuPage, @@ -42,8 +44,13 @@ class NewspaperFigaroBrowser(BaseBrowser): def is_logged(self): return False + def login(self): + pass + + def fillobj(self, obj, fields): + pass + def get_content(self, _id): - url = _id - self.location(url) - print self.page + "return page article content" + self.location(_id) return self.page.get_article(_id) diff --git a/weboob/backends/lefigaro/pages/__init__.py b/weboob/backends/lefigaro/pages/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/weboob/backends/lefigaro/tools.py b/weboob/backends/lefigaro/tools.py index e0a157a2..c1179a10 100644 --- a/weboob/backends/lefigaro/tools.py +++ b/weboob/backends/lefigaro/tools.py @@ -1,3 +1,4 @@ +"tools for lefigaro backend" # -*- coding: utf-8 -*- # Copyright(C) 2011 Julien Hebert @@ -18,6 +19,7 @@ import re def id2url(_id): + "return an url from an id" regexp2 = re.compile("(\w+).([0-9]+).(.*$)") match = regexp2.match(_id) if match: @@ -28,4 +30,5 @@ def id2url(_id): raise ValueError("id doesn't match") def url2id(url): + "return an id from an url" return url diff --git a/weboob/backends/minutes20/__init__.py b/weboob/backends/minutes20/__init__.py index b1e19911..03bc6dec 100644 --- a/weboob/backends/minutes20/__init__.py +++ b/weboob/backends/minutes20/__init__.py @@ -1,3 +1,4 @@ +"init of Newspaper20minutesBackend" # -*- coding: utf-8 -*- # Copyright(C) 2011 Julien Hebert diff --git a/weboob/backends/minutes20/backend.py b/weboob/backends/minutes20/backend.py index 82061c1c..87b5e10a 100644 --- a/weboob/backends/minutes20/backend.py +++ b/weboob/backends/minutes20/backend.py @@ -26,6 +26,7 @@ from .tools import url2id from .browser import Newspaper20minutesBrowser class Newspaper20minutesBackend(BaseBackend, ICapMessages): + "Newspaper20minutesBackend class" MAINTAINER = 'Julien Hebert' EMAIL = 'juke@free.fr' VERSION = '0.6' @@ -78,6 +79,7 @@ class Newspaper20minutesBackend(BaseBackend, ICapMessages): yield(thread) def fill_thread(self, thread): + "fill the thread" return self.get_thread(thread) def iter_unread_messages(self, thread=None): diff --git a/weboob/backends/minutes20/browser.py b/weboob/backends/minutes20/browser.py index feb46808..76027a06 100644 --- a/weboob/backends/minutes20/browser.py +++ b/weboob/backends/minutes20/browser.py @@ -1,3 +1,4 @@ +"browser for 20minutes website" # -*- coding: utf-8 -*- # Copyright(C) 2011 Julien Hebert @@ -22,6 +23,7 @@ from .tools import id2url class Newspaper20minutesBrowser(BaseBrowser): + "Newspaper20minutesBrowser class" PAGES = { 'http://www.20minutes.fr/article/?.*': ArticlePage, 'http://www.20minutes.fr/ledirect/?.*': SimplePage, @@ -31,7 +33,14 @@ class Newspaper20minutesBrowser(BaseBrowser): def is_logged(self): return False + def login(self): + pass + + def fillobj(self, obj, fields): + pass + def get_content(self, _id): + "return page article content" try : url = id2url(_id) except ValueError: diff --git a/weboob/backends/minutes20/pages/__init__.py b/weboob/backends/minutes20/pages/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/weboob/backends/minutes20/tools.py b/weboob/backends/minutes20/tools.py index 92b64c16..0cf9f34e 100644 --- a/weboob/backends/minutes20/tools.py +++ b/weboob/backends/minutes20/tools.py @@ -1,3 +1,4 @@ +"common tools for 20minutes backend" # -*- coding: utf-8 -*- # Copyright(C) 2011 Julien Hebert @@ -18,6 +19,7 @@ import re def id2url(_id): + "return an url from an id" regexp2 = re.compile("(\w+).([0-9]+).(.*$)") match = regexp2.match(_id) if match: @@ -28,6 +30,7 @@ def id2url(_id): raise ValueError("id doesn't match") def url2id(url): + "return an id from an url" regexp = re.compile("http://www.20minutes.fr/(\w+)/([0-9]+)/(.*$)") match = regexp.match(url) return '%s.%d.%s' % (match.group(1), int(match.group(2)), match.group(3))