From fa42b82c692bcb0041a38271b8782d14ec9ad8fe Mon Sep 17 00:00:00 2001 From: Julien Veyssier Date: Thu, 7 Mar 2013 02:58:23 +0100 Subject: [PATCH] [imdb] clean, [cineoob] clean --- modules/imdb/browser.py | 8 +++----- modules/imdb/pages.py | 13 ++++++++++--- modules/imdb/test.py | 2 -- weboob/applications/cineoob/cineoob.py | 6 +++--- 4 files changed, 16 insertions(+), 13 deletions(-) diff --git a/modules/imdb/browser.py b/modules/imdb/browser.py index d6b881e9..22529233 100644 --- a/modules/imdb/browser.py +++ b/modules/imdb/browser.py @@ -53,7 +53,6 @@ class ImdbBrowser(BaseBrowser): short_description = u'%s %s'%(tdesc.split('<')[0].strip(', '), tdesc.split('>')[1].split('<')[0]) else: short_description = tdesc.strip(', ') - #movie = self.get_movie(m['id']) movie = Movie(m['id'],unicode(m['title'])) movie.other_titles = NotLoaded movie.release_date = NotLoaded @@ -71,9 +70,8 @@ class ImdbBrowser(BaseBrowser): for cat in ['name_popular','name_exact','name_approx']: if jres.has_key(cat): for p in jres[cat]: - #person = self.get_person(p['id']) - person = Person(p['id'],p['name']) - person.real_name = NotLoaded + person = Person(p['id'],unicode(p['name'])) + person.real_name = NotLoaded person.birth_place = NotLoaded person.birth_date = NotLoaded person.death_date = NotLoaded @@ -103,7 +101,7 @@ class ImdbBrowser(BaseBrowser): title = unicode(jres['title'].strip()) if jres.has_key('directors'): - short_description = ', '.join(jres['directors']) + short_description = unicode(', '.join(jres['directors'])) if jres.has_key('runtime'): dur_str = jres['runtime'][0].split(':') if len(dur_str) == 1: diff --git a/modules/imdb/pages.py b/modules/imdb/pages.py index ad9906da..292bf205 100644 --- a/modules/imdb/pages.py +++ b/modules/imdb/pages.py @@ -19,7 +19,7 @@ from weboob.capabilities.cinema import Person, Movie -from weboob.capabilities.base import NotAvailable +from weboob.capabilities.base import NotAvailable, NotLoaded from weboob.tools.browser import BasePage from datetime import datetime @@ -56,9 +56,16 @@ class MovieCrewPage(BasePage): id = td.find('a').attrib.get('href','').strip('/').split('/')[-1] name = unicode(td.find('a').text) char_name = unicode(self.parser.select(td.getparent(),'td.char',1).text_content()) - #yield self.browser.get_person(id) person = Person(id,name) person.short_description = char_name + person.real_name = NotLoaded + person.birth_place = NotLoaded + person.birth_date = NotLoaded + person.death_date = NotLoaded + person.gender = NotLoaded + person.nationality = NotLoaded + person.short_biography= NotLoaded + person.roles = NotLoaded yield person for gloss_link in self.parser.select(self.document.getroot(),'table[cellspacing=1] h5 a'): @@ -189,7 +196,7 @@ class FilmographyPage(BasePage): for a in self.parser.select(role_div,'ol > li > a'): id = a.attrib.get('href','').strip('/').split('/')[-1] if id.startswith('tt'): - title = a.text + title = unicode(a.text) role_detail = NotAvailable if len(a.tail) > 0: role_detail = unicode(' '.join(a.tail.replace('..','').split())) diff --git a/modules/imdb/test.py b/modules/imdb/test.py index e337a83f..b4a9d3c1 100644 --- a/modules/imdb/test.py +++ b/modules/imdb/test.py @@ -19,8 +19,6 @@ from weboob.tools.test import BackendTest -#from random import choice - class ImdbTest(BackendTest): BACKEND = 'imdb' diff --git a/weboob/applications/cineoob/cineoob.py b/weboob/applications/cineoob/cineoob.py index b96de521..8b86666b 100644 --- a/weboob/applications/cineoob/cineoob.py +++ b/weboob/applications/cineoob/cineoob.py @@ -23,7 +23,7 @@ import sys from datetime import datetime from weboob.capabilities.cinema import ICapCinema -from weboob.capabilities.base import NotAvailable, NotLoaded +from weboob.capabilities.base import NotAvailable from weboob.tools.application.repl import ReplApplication from weboob.tools.application.formatters.iformatter import IFormatter, PrettyFormatter @@ -262,7 +262,7 @@ class Cineoob(ReplApplication): print >>sys.stderr, 'Movie not found: %s' % id return 3 - backend.fillobj(movie, ('duration')) + #backend.fillobj(movie, ('duration')) self.start_format() self.format(movie) @@ -287,7 +287,7 @@ class Cineoob(ReplApplication): print >>sys.stderr, 'Person not found: %s' % id return 3 - backend.fillobj(person, ('birth_date','short_biography')) + #backend.fillobj(person, ('birth_date','short_biography')) self.start_format() self.format(person)