Code clarity fixes

autopep8 -ir -j2 --select=E303,E125
Diff checked manually.
This commit is contained in:
Laurent Bachelier 2013-03-15 19:54:17 +01:00
commit c21d1f7925
37 changed files with 6 additions and 59 deletions

View file

@ -136,7 +136,6 @@ class Downloadboob:
return u"%s/%s.%s" % (directory, removeNonAscii(video.id), ext) return u"%s/%s.%s" % (directory, removeNonAscii(video.id), ext)
def get_linkname(self, video): def get_linkname(self, video):
if not os.path.exists(self.links_directory): if not os.path.exists(self.links_directory):
os.makedirs(self.links_directory) os.makedirs(self.links_directory)
@ -151,12 +150,10 @@ class Downloadboob:
return u"%s/%s (%s).%s" % (self.links_directory, removeSpecial(video.title), removeSpecial(misc), ext) return u"%s/%s (%s).%s" % (self.links_directory, removeSpecial(video.title), removeSpecial(misc), ext)
def is_downloaded(self, video): def is_downloaded(self, video):
# check if the file is 0 byte # check if the file is 0 byte
return os.path.isfile(self.get_filename(video)) return os.path.isfile(self.get_filename(video))
def remove_download(self, video): def remove_download(self, video):
path = self.get_filename(video) path = self.get_filename(video)
if os.stat(path).st_size == 0: if os.stat(path).st_size == 0:
@ -169,7 +166,6 @@ class Downloadboob:
with open(path, 'w'): with open(path, 'w'):
pass pass
def set_linkname(self, video): def set_linkname(self, video):
linkname = self.get_linkname(video) linkname = self.get_linkname(video)
idname = self.get_filename(video, relative=True) idname = self.get_filename(video, relative=True)
@ -178,7 +174,6 @@ class Downloadboob:
print "%s -> %s" % (linkname, idname) print "%s -> %s" % (linkname, idname)
os.symlink(idname, linkname) os.symlink(idname, linkname)
def do_download(self, video): def do_download(self, video):
if not video: if not video:
print >>sys.stderr, 'Video not found: %s' % video print >>sys.stderr, 'Video not found: %s' % video

View file

@ -61,7 +61,6 @@ class BNPVirtKeyboard(MappedVirtKeyboard):
return code return code
class LoginPage(BasePage): class LoginPage(BasePage):
def on_loaded(self): def on_loaded(self):
for td in self.document.getroot().cssselect('td.LibelleErreur'): for td in self.document.getroot().cssselect('td.LibelleErreur'):
@ -128,7 +127,6 @@ class ChangePasswordPage(BasePage):
cookiejar.set_cookie(c) cookiejar.set_cookie(c)
code_current=vk.get_string_code(current) code_current=vk.get_string_code(current)
code_new=vk.get_string_code(new) code_new=vk.get_string_code(new)

View file

@ -27,7 +27,6 @@ from weboob.tools.browser import BasePage
from weboob.tools.capabilities.bank.transactions import FrenchTransaction from weboob.tools.capabilities.bank.transactions import FrenchTransaction
__all__ = ['AccountHistory'] __all__ = ['AccountHistory']
class Transaction(FrenchTransaction): class Transaction(FrenchTransaction):

View file

@ -45,7 +45,6 @@ from hellhttp import HellHTTPS
__all__ = ['CmbBackend'] __all__ = ['CmbBackend']
class CmbBackend(BaseBackend, ICapBank): class CmbBackend(BaseBackend, ICapBank):
NAME = 'cmb' NAME = 'cmb'
MAINTAINER = u'Johann Broudin' MAINTAINER = u'Johann Broudin'
@ -98,8 +97,6 @@ class CmbBackend(BaseBackend, ICapBank):
) )
] ]
cookie = None cookie = None
headers = { headers = {
'User-Agent': 'User-Agent':
@ -197,7 +194,6 @@ class CmbBackend(BaseBackend, ICapBank):
account._cmbvaleur2 = m.group(2) account._cmbvaleur2 = m.group(2)
account._cmbtype = m.group(3) account._cmbtype = m.group(3)
balance = u''.join([txt.strip() for txt in td[2].itertext()]) balance = u''.join([txt.strip() for txt in td[2].itertext()])
balance = balance.replace(',', '.').replace(u"\xa0", '') balance = balance.replace(',', '.').replace(u"\xa0", '')
account.balance = Decimal(balance) account.balance = Decimal(balance)
@ -252,7 +248,6 @@ class CmbBackend(BaseBackend, ICapBank):
parser = etree.HTMLParser() parser = etree.HTMLParser()
tree = etree.parse(StringIO(data), parser) tree = etree.parse(StringIO(data), parser)
tables = tree.xpath('/html/body/table') tables = tree.xpath('/html/body/table')
if len(tables) == 0: if len(tables) == 0:
title = tree.xpath('/html/head/title')[0].text title = tree.xpath('/html/head/title')[0].text
@ -275,7 +270,7 @@ class CmbBackend(BaseBackend, ICapBank):
continue continue
for tr in table.getiterator('tr'): for tr in table.getiterator('tr'):
if (tr.get('class') != 'LnTit' and if (tr.get('class') != 'LnTit' and
tr.get('class') != 'LnTot'): tr.get('class') != 'LnTot'):
operation = Transaction(i) operation = Transaction(i)
td = tr.xpath('td') td = tr.xpath('td')

View file

@ -34,7 +34,6 @@ class HTTPSVerifiedConnection(httplib.HTTPSConnection):
This class allows communication via SSL, and will checks certificates This class allows communication via SSL, and will checks certificates
""" """
def __init__(self, host, port=None, key_file=None, cert_file=None, def __init__(self, host, port=None, key_file=None, cert_file=None,
ca_file=None, strict=None, timeout=socket._GLOBAL_DEFAULT_TIMEOUT, ca_file=None, strict=None, timeout=socket._GLOBAL_DEFAULT_TIMEOUT,
callBack=None): callBack=None):

View file

@ -159,7 +159,6 @@ class ComingTransactionsPage(BasePage):
else: else:
date += "/%d" % time.localtime().tm_year date += "/%d" % time.localtime().tm_year
t = Transaction(date+""+raw) t = Transaction(date+""+raw)
t.parse(date, re.sub(r'[ ]+', ' ', raw)) t.parse(date, re.sub(r'[ ]+', ' ', raw))
t.set_amount("", debit) t.set_amount("", debit)

View file

@ -30,7 +30,6 @@ class StartPage(BasePage):
u"Niederschlag", u"Globalstrahlung", u"Schneehoehe"] u"Niederschlag", u"Globalstrahlung", u"Schneehoehe"]
unit = [u"°C", u"km/h", u"hPa", u"%", u"mm", u"W/m²", u"cm"] unit = [u"°C", u"km/h", u"hPa", u"%", u"mm", u"W/m²", u"cm"]
def get_sensors_list(self): def get_sensors_list(self):
paraphs = self.document.xpath('//p[@align="center"]') paraphs = self.document.xpath('//p[@align="center"]')
sensors = [] sensors = []

View file

@ -32,7 +32,6 @@ from weboob.tools.browser import BrokenPageError
from .video import EuroparlVideo from .video import EuroparlVideo
__all__ = ['VideoPage'] __all__ = ['VideoPage']
class VideoPage(BasePage): class VideoPage(BasePage):

View file

@ -35,8 +35,6 @@ from .video import GDCVaultVideo
#import lxml.etree #import lxml.etree
__all__ = ['VideoPage'] __all__ = ['VideoPage']
class VideoPage(BasePage): class VideoPage(BasePage):

View file

@ -48,7 +48,6 @@ class GoogleTranslateBackend(BaseBackend, ICapTranslate):
'Telugu':'te', 'Thai':'th', 'Turkish':'tr', 'Ukrainian':'uk', 'Urdu':'ur', 'Vietnamese':'vi', 'Welsh':'cy', 'Yiddish':'yi', 'Telugu':'te', 'Thai':'th', 'Turkish':'tr', 'Ukrainian':'uk', 'Urdu':'ur', 'Vietnamese':'vi', 'Welsh':'cy', 'Yiddish':'yi',
} }
def translate(self, lan_from, lan_to, text): def translate(self, lan_from, lan_to, text):
if not lan_from in self.GOOGLELANGUAGE.keys(): if not lan_from in self.GOOGLELANGUAGE.keys():
raise LanguageNotSupported() raise LanguageNotSupported()

View file

@ -103,7 +103,6 @@ class LoginPage(BasePage):
err = self.document.find('//span[@class="error"]') err = self.document.find('//span[@class="error"]')
return err is not None return err is not None
def login(self, password): def login(self, password):
# 2) And now, the virtual Keyboard # 2) And now, the virtual Keyboard
try: try:

View file

@ -23,7 +23,6 @@ from .pages.inrockstv import InrocksTvPage
from weboob.tools.browser import BaseBrowser from weboob.tools.browser import BaseBrowser
class NewspaperInrocksBrowser(BaseBrowser): class NewspaperInrocksBrowser(BaseBrowser):
"NewspaperInrocksBrowser class" "NewspaperInrocksBrowser class"
PAGES = { PAGES = {

View file

@ -55,7 +55,6 @@ class ResultsPage(BasePage):
yield recipe yield recipe
class RecipePage(BasePage): class RecipePage(BasePage):
""" Page which contains a recipe """ Page which contains a recipe
""" """

View file

@ -37,7 +37,6 @@ class NewsfeedBackend(BaseBackend, ICapMessages):
CONFIG = BackendConfig(Value('url', label="Atom/RSS feed's url", regexp='https?://.*')) CONFIG = BackendConfig(Value('url', label="Atom/RSS feed's url", regexp='https?://.*'))
STORAGE = {'seen': []} STORAGE = {'seen': []}
def iter_threads(self): def iter_threads(self):
for article in Newsfeed(self.config['url'].get()).iter_entries(): for article in Newsfeed(self.config['url'].get()).iter_entries():
yield self.get_thread(article.id, article) yield self.get_thread(article.id, article)
@ -75,15 +74,12 @@ class NewsfeedBackend(BaseBackend, ICapMessages):
flags=flags) flags=flags)
return thread return thread
def iter_unread_messages(self): def iter_unread_messages(self):
for thread in self.iter_threads(): for thread in self.iter_threads():
for m in thread.iter_all_messages(): for m in thread.iter_all_messages():
if m.flags & m.IS_UNREAD: if m.flags & m.IS_UNREAD:
yield m yield m
def set_message_read(self, message): def set_message_read(self, message):
self.storage.get('seen', default=[]).append(message.thread.id) self.storage.get('seen', default=[]).append(message.thread.id)
self.storage.save() self.storage.save()

View file

@ -44,7 +44,6 @@ class OkCBrowser(BaseBrowser):
('http://%s/profile/[^/]*' % DOMAIN, ProfilePage), ('http://%s/profile/[^/]*' % DOMAIN, ProfilePage),
)) ))
logged_in = False logged_in = False
def home(self): def home(self):

View file

@ -60,7 +60,7 @@ class AloesBrowser(BaseBrowser):
no_login=True) no_login=True)
if not self.page.login(self.username, self.password) or \ if not self.page.login(self.username, self.password) or \
not self.is_logged() or \ not self.is_logged() or \
(self.is_on_page(LoginPage) and self.page.is_error()): (self.is_on_page(LoginPage) and self.page.is_error()):
raise BrowserIncorrectPassword() raise BrowserIncorrectPassword()
def get_rented_books_list(self): def get_rented_books_list(self):

View file

@ -101,7 +101,6 @@ class SubtitlesPage(BasePage):
return subtitle return subtitle
class SubtitlePage(BasePage): class SubtitlePage(BasePage):
""" Page which contains a single subtitle for a movie """ Page which contains a single subtitle for a movie
""" """

View file

@ -36,7 +36,6 @@ class ParolesmaniaTest(BackendTest):
assert full_lyr.artist assert full_lyr.artist
assert full_lyr.content is not NotLoaded assert full_lyr.content is not NotLoaded
def test_search_artist(self): def test_search_artist(self):
l_lyrics = list(self.backend.iter_lyrics('artist','boris')) l_lyrics = list(self.backend.iter_lyrics('artist','boris'))
for songlyrics in l_lyrics: for songlyrics in l_lyrics:

View file

@ -36,7 +36,6 @@ class ParolesmusiqueTest(BackendTest):
assert full_lyr.artist assert full_lyr.artist
assert full_lyr.content is not NotLoaded assert full_lyr.content is not NotLoaded
def test_search_artist(self): def test_search_artist(self):
l_lyrics = list(self.backend.iter_lyrics('artist','boris')) l_lyrics = list(self.backend.iter_lyrics('artist','boris'))
for songlyrics in l_lyrics: for songlyrics in l_lyrics:

View file

@ -37,6 +37,5 @@ class WikiEditPage(BasePage):
return wiki_form.xpath('div/input')[0].get('value') return wiki_form.xpath('div/input')[0].get('value')
class WikiPage(BasePage): class WikiPage(BasePage):
pass pass

Some files were not shown because too many files have changed in this diff Show more