PEP8 style fixes and other small style fixes
I used autopep8 on some files and did carefully check the changes. I ignored E501,E302,E231,E225,E222,E221,E241,E203 in my search, and at least E501 on any autopep8 run. Other style fixes not related to PEP8: * Only use new-style classes. I don't think the usage of old-style classes was voluntary. Old-style classes are removed in Python 3. * Convert an if/else to a one-liner in mediawiki, change docstring style change to a comment something that wasn't really appropriate for a docstring. * Unneeded first if condition in meteofrance
This commit is contained in:
parent
1e000acf3a
commit
006e97a8be
99 changed files with 441 additions and 350 deletions
|
|
@ -1 +0,0 @@
|
|||
|
||||
|
|
@ -28,6 +28,7 @@ from weboob.tools.test import BackendTest
|
|||
|
||||
__all__ = ['GenericComicReaderBackend']
|
||||
|
||||
|
||||
class DisplayPage(BasePage):
|
||||
def get_page(self, gallery):
|
||||
src = self.document.xpath(self.browser.params['img_src_xpath'])[0]
|
||||
|
|
@ -102,7 +103,6 @@ class GenericComicReaderBackend(BaseBackend, ICapGallery):
|
|||
else:
|
||||
return None
|
||||
|
||||
|
||||
gallery = BaseGallery(_id, url=(self.ID_TO_URL % _id))
|
||||
with self.browser:
|
||||
return gallery
|
||||
|
|
@ -116,7 +116,7 @@ class GenericComicReaderBackend(BaseBackend, ICapGallery):
|
|||
|
||||
OBJECTS = {
|
||||
BaseGallery: fill_gallery,
|
||||
BaseImage: fill_image }
|
||||
BaseImage: fill_image}
|
||||
|
||||
|
||||
class GenericComicReaderTest(BackendTest):
|
||||
|
|
@ -126,4 +126,3 @@ class GenericComicReaderTest(BackendTest):
|
|||
it.next()
|
||||
img = it.next()
|
||||
self.backend.fillobj(img, ('url', 'data'))
|
||||
|
||||
|
|
|
|||
|
|
@ -20,11 +20,12 @@
|
|||
# python2.5 compatibility
|
||||
from __future__ import with_statement
|
||||
|
||||
import time
|
||||
import time
|
||||
from weboob.capabilities.messages import ICapMessages, Message, Thread
|
||||
from weboob.tools.backend import BaseBackend
|
||||
from weboob.tools.newsfeed import Newsfeed
|
||||
|
||||
|
||||
class GenericNewspaperBackend(BaseBackend, ICapMessages):
|
||||
"GenericNewspaperBackend class"
|
||||
MAINTAINER = 'Julien Hebert'
|
||||
|
|
@ -71,13 +72,13 @@ class GenericNewspaperBackend(BaseBackend, ICapMessages):
|
|||
content=content.body,
|
||||
signature='URL: %s' % content.url,
|
||||
flags=flags,
|
||||
children= [])
|
||||
children=[])
|
||||
return thread
|
||||
|
||||
def iter_threads(self):
|
||||
for article in Newsfeed(self.RSS_FEED, GenericNewspaperBackend.RSSID).iter_entries():
|
||||
thread = Thread(article.id)
|
||||
thread.title = article.title
|
||||
thread.title = article.title
|
||||
thread.date = article.datetime
|
||||
yield(thread)
|
||||
|
||||
|
|
@ -112,7 +113,7 @@ class GenericNewspaperBackend(BaseBackend, ICapMessages):
|
|||
if time.time() - lastpurge > 7200:
|
||||
self.storage.set('lastpurge', time.time())
|
||||
for id in self.storage.get('seen', default={}):
|
||||
l.append((int(url2id(id)), id))
|
||||
l.append((int(url2id(id)), id))
|
||||
l.sort()
|
||||
l.reverse()
|
||||
tosave = [v[1] for v in l[0:self.RSSSIZE + 10]]
|
||||
|
|
|
|||
|
|
@ -23,8 +23,8 @@ from lxml.etree import Comment
|
|||
|
||||
|
||||
def try_remove(parser, base_element, selector):
|
||||
try :
|
||||
base_element.remove(parser.select(base_element, selector, 1 ))
|
||||
try:
|
||||
base_element.remove(parser.select(base_element, selector, 1))
|
||||
except (BrokenPageError, ValueError):
|
||||
pass
|
||||
|
||||
|
|
@ -33,6 +33,7 @@ def try_drop_tree(parser, base_element, selector):
|
|||
for el in parser.select(base_element, selector):
|
||||
el.drop_tree()
|
||||
|
||||
|
||||
def remove_from_selector_list(parser, base_element, selector_list):
|
||||
for selector in selector_list:
|
||||
base_element.remove(parser.select(base_element, selector, 1))
|
||||
|
|
@ -42,24 +43,28 @@ def try_remove_from_selector_list(parser, base_element, selector_list):
|
|||
for selector in selector_list:
|
||||
try_remove(parser, base_element, selector)
|
||||
|
||||
|
||||
def drop_comments(base_element):
|
||||
for comment in base_element.getiterator(Comment):
|
||||
comment.drop_tree()
|
||||
|
||||
|
||||
|
||||
class NoAuthorElement(BrokenPageError):
|
||||
pass
|
||||
|
||||
|
||||
class NoBodyElement(BrokenPageError):
|
||||
pass
|
||||
|
||||
|
||||
class NoTitleException(BrokenPageError):
|
||||
pass
|
||||
|
||||
|
||||
class NoneMainDiv(AttributeError):
|
||||
pass
|
||||
|
||||
|
||||
class Article(object):
|
||||
author = u''
|
||||
title = u''
|
||||
|
|
@ -71,10 +76,11 @@ class Article(object):
|
|||
self.url = u''
|
||||
self.date = None
|
||||
|
||||
|
||||
class GenericNewsPage(BasePage):
|
||||
__element_body = NotImplementedError
|
||||
__article = Article
|
||||
element_title_selector = NotImplementedError
|
||||
element_title_selector = NotImplementedError
|
||||
main_div = NotImplementedError
|
||||
element_body_selector = NotImplementedError
|
||||
element_author_selector = NotImplementedError
|
||||
|
|
@ -90,7 +96,7 @@ class GenericNewsPage(BasePage):
|
|||
return self.__article.author
|
||||
|
||||
def get_title(self):
|
||||
try :
|
||||
try:
|
||||
return self.parser.select(
|
||||
self.main_div,
|
||||
self.element_title_selector,
|
||||
|
|
@ -108,7 +114,7 @@ class GenericNewsPage(BasePage):
|
|||
return self.get_title()
|
||||
|
||||
def get_element_body(self):
|
||||
try :
|
||||
try:
|
||||
return self.parser.select(self.main_div, self.element_body_selector, 1)
|
||||
except BrokenPageError:
|
||||
raise NoBodyElement("no body on %s" % (self.browser))
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue