From 6c49775896c07e14ba8bf95b68ad13e4db7d1275 Mon Sep 17 00:00:00 2001 From: Bezleputh Date: Fri, 21 Mar 2014 19:22:27 +0100 Subject: [PATCH] [senscritique] continue browser2 adaptation --- modules/senscritique/browser.py | 15 ++------------- modules/senscritique/calendar.py | 1 - modules/senscritique/pages.py | 2 +- 3 files changed, 3 insertions(+), 15 deletions(-) diff --git a/modules/senscritique/browser.py b/modules/senscritique/browser.py index 4508f959..532d413e 100644 --- a/modules/senscritique/browser.py +++ b/modules/senscritique/browser.py @@ -129,7 +129,7 @@ class SenscritiqueBrowser(PagesBrowser): if not isinstance(event, SensCritiquenCalendarEvent): event = event.next() - event.resume = self.get_resume(_id) + event._resume = self.get_resume(_id) self._setup_session(Firefox()) event = self.event_page.go(_id=_id).get_event(obj=event) @@ -138,17 +138,6 @@ class SenscritiqueBrowser(PagesBrowser): def get_resume(self, _id): self._setup_session(SensCritiqueJsonProfile()) - re_id = re.compile('^/?(.*)/.*', re.DOTALL) + re_id = re.compile('^/?.*/(.*)', re.DOTALL) a_id = re_id.search(_id).group(1) - return self.json_page.go(_id=a_id).get_resume() - # return "get resume" - """ - self.HEADER_RESUME['Referer'] = url - req = urllib2.Request('http://www.senscritique.com/sc/products/storyline/%s.json' % _id, - headers=self.HEADER_RESUME) - response = self.open(req) - result = simplejson.loads(response.read(), self.ENCODING) - if result['json']['success']: - return result['json']['data'] - """ diff --git a/modules/senscritique/calendar.py b/modules/senscritique/calendar.py index 923fb0a9..9af0010b 100644 --- a/modules/senscritique/calendar.py +++ b/modules/senscritique/calendar.py @@ -28,4 +28,3 @@ class SensCritiquenCalendarEvent(BaseCalendarEvent): self.transp = TRANSP.TRANSPARENT self.status = STATUS.CONFIRMED self.category = CATEGORIES.TELE - self.resume = None diff --git a/modules/senscritique/pages.py b/modules/senscritique/pages.py index cc1b637f..9474450a 100644 --- a/modules/senscritique/pages.py +++ b/modules/senscritique/pages.py @@ -169,7 +169,7 @@ class EventPage(HTMLPage): event.url = self.page.url resume = Resume('//section[@class="pvi-productDetails"]')(self) if not resume: - resume = self.obj.resume + resume = self.obj._resume description = Description('.')(self) event.description = u'%s%s' % (description, resume) return event