nojhan/weboob-devel
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

autopep8 with 120 chars line length on my modules

Browse source
This commit is contained in:
Julien Veyssier 2013-03-16 01:39:35 +01:00
commit 5d923bc73b
39 changed files with 434 additions and 426 deletions
Download patch file Download diff file Expand all files Collapse all files

4
modules/parolesmusique/backend.py
View file

@ -41,7 +41,7 @@ class ParolesmusiqueBackend(BaseBackend, ICapLyrics):
return self.browser.get_lyrics(id)
def iter_lyrics(self, criteria, pattern):
return self.browser.iter_lyrics(criteria,pattern.encode('utf-8'))
return self.browser.iter_lyrics(criteria, pattern.encode('utf-8'))
def fill_songlyrics(self, songlyrics, fields):
if 'content' in fields:
@ -50,5 +50,5 @@ class ParolesmusiqueBackend(BaseBackend, ICapLyrics):
return songlyrics
OBJECTS = {
SongLyrics:fill_songlyrics
SongLyrics: fill_songlyrics
}

4
modules/parolesmusique/browser.py
View file

@ -37,12 +37,12 @@ class ParolesmusiqueBrowser(BaseBrowser):
'http://www.paroles-musique.com/lyrics-paroles-.*-0,0.php': ArtistResultsPage,
'http://www.paroles-musique.com/paroles-.*p[0-9]*': SonglyricsPage,
'http://www.paroles-musique.com/paroles-.*-lyrics,a[0-9]*': ArtistSongsPage,
}
}
def iter_lyrics(self, criteria, pattern):
self.location('http://www.paroles-musique.com')
assert self.is_on_page(HomePage)
return self.page.iter_lyrics(criteria,pattern)
return self.page.iter_lyrics(criteria, pattern)
def get_lyrics(self, id):
self.location('http://www.paroles-musique.com/paroles-%s' % id)

26
modules/parolesmusique/pages.py
View file

@ -23,11 +23,11 @@ from weboob.capabilities.base import NotAvailable, NotLoaded
from weboob.tools.browser import BasePage
__all__ = ['SongResultsPage','SonglyricsPage', 'ArtistResultsPage', 'ArtistSongsPage', 'HomePage']
__all__ = ['SongResultsPage', 'SonglyricsPage', 'ArtistResultsPage', 'ArtistSongsPage', 'HomePage']
class HomePage(BasePage):
def iter_lyrics(self,criteria,pattern):
def iter_lyrics(self, criteria, pattern):
self.browser.select_form(name='rechercher')
if criteria == 'artist':
self.browser['termes_a'] = pattern
@ -41,21 +41,21 @@ class HomePage(BasePage):
class ArtistResultsPage(BasePage):
def iter_lyrics(self):
for link in self.parser.select(self.document.getroot(),'div.cont_cat table a.std'):
for link in self.parser.select(self.document.getroot(), 'div.cont_cat table a.std'):
artist = unicode(link.text_content())
self.browser.location('http://www.paroles-musique.com%s'%link.attrib.get('href',''))
self.browser.location('http://www.paroles-musique.com%s' % link.attrib.get('href', ''))
assert self.browser.is_on_page(ArtistSongsPage)
for lyr in self.browser.page.iter_lyrics(artist):
yield lyr
class ArtistSongsPage(BasePage):
def iter_lyrics(self,artist):
for link in self.parser.select(self.document.getroot(),'div.cont_catA div.art_scroll a'):
href = link.attrib.get('href','')
def iter_lyrics(self, artist):
for link in self.parser.select(self.document.getroot(), 'div.cont_catA div.art_scroll a'):
href = link.attrib.get('href', '')
if href.startswith('./paroles'):
title = unicode(link.text)
id = href.replace('./paroles-','')
id = href.replace('./paroles-', '')
songlyrics = SongLyrics(id, title)
songlyrics.artist = artist
songlyrics.content = NotLoaded
@ -65,14 +65,14 @@ class ArtistSongsPage(BasePage):
class SongResultsPage(BasePage):
def iter_lyrics(self):
first = True
for tr in self.parser.select(self.document.getroot(),'div.cont_cat table tr'):
for tr in self.parser.select(self.document.getroot(), 'div.cont_cat table tr'):
if first:
first = False
continue
artist = NotAvailable
links = self.parser.select(tr,'a.std')
links = self.parser.select(tr, 'a.std')
title = unicode(links[0].text)
id = links[0].attrib.get('href','').replace('/paroles-','')
id = links[0].attrib.get('href', '').replace('/paroles-', '')
artist = unicode(links[1].text)
songlyrics = SongLyrics(id, title)
songlyrics.artist = artist
@ -84,8 +84,8 @@ class SonglyricsPage(BasePage):
def get_lyrics(self, id):
artist = NotAvailable
title = NotAvailable
content = unicode(self.parser.select(self.document.getroot(),'div#lyr_scroll',1).text_content().strip())
infos = self.parser.select(self.document.getroot(),'h2.lyrics > font')
content = unicode(self.parser.select(self.document.getroot(), 'div#lyr_scroll', 1).text_content().strip())
infos = self.parser.select(self.document.getroot(), 'h2.lyrics > font')
artist = unicode(infos[0].text)
title = unicode(infos[1].text)
songlyrics = SongLyrics(id, title)

4
modules/parolesmusique/test.py
View file

@ -25,7 +25,7 @@ class ParolesmusiqueTest(BackendTest):
BACKEND = 'parolesmusique'
def test_search_song_n_get(self):
l_lyrics = list(self.backend.iter_lyrics('song','chien'))
l_lyrics = list(self.backend.iter_lyrics('song', 'chien'))
for songlyrics in l_lyrics:
assert songlyrics.id
assert songlyrics.title
@ -38,7 +38,7 @@ class ParolesmusiqueTest(BackendTest):
assert full_lyr.content is not NotLoaded
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:
assert songlyrics.id
assert songlyrics.title