From be6c5356d507752be818b06aae9029ad559cc505 Mon Sep 17 00:00:00 2001 From: Florent Date: Thu, 23 May 2013 17:01:51 +0200 Subject: [PATCH] Some pep8 cleaning --- modules/vlille/backend.py | 3 ++- modules/vlille/pages.py | 22 +++++++++++----------- modules/vlille/test.py | 1 + 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/modules/vlille/backend.py b/modules/vlille/backend.py index 1fca5ac1..5410db16 100644 --- a/modules/vlille/backend.py +++ b/modules/vlille/backend.py @@ -19,12 +19,13 @@ from weboob.tools.backend import BaseBackend -from weboob.capabilities.gauge import ICapGauge,GaugeSensor, Gauge, SensorNotFound +from weboob.capabilities.gauge import ICapGauge, GaugeSensor, Gauge, SensorNotFound from .browser import VlilleBrowser __all__ = ['VlilleBackend'] + class VlilleBackend(BaseBackend, ICapGauge): NAME = 'vlille' DESCRIPTION = u'accès aux données vlille' diff --git a/modules/vlille/pages.py b/modules/vlille/pages.py index 6f00a935..aa59fbc2 100644 --- a/modules/vlille/pages.py +++ b/modules/vlille/pages.py @@ -21,7 +21,8 @@ from weboob.tools.browser import BasePage from weboob.capabilities.gauge import Gauge, GaugeMeasure, GaugeSensor from weboob.capabilities.base import NotLoaded -import datetime, re +import datetime +import re __all__ = ['InfoStationPage', 'ListStationsPage'] @@ -30,7 +31,7 @@ class InfoStationPage(BasePage): def _create_bikes_sensor(self, value, gauge_id, last_update, adresse): levelbikes = GaugeSensor(gauge_id + '-bikes') levelbikes.name = u'Bikes' - levelbikes.address = u'%s' %adresse + levelbikes.address = u'%s' % adresse lastvalue = GaugeMeasure() lastvalue.level = float(value) lastvalue.date = last_update @@ -44,7 +45,7 @@ class InfoStationPage(BasePage): def _create_attach_sensor(self, value, gauge_id, last_update, adresse): levelattach = GaugeSensor(gauge_id + '-attach') levelattach.name = u'Attach' - levelattach.address = u'%s' %adresse + levelattach.address = u'%s' % adresse lastvalue = GaugeMeasure() lastvalue.level = float(value) lastvalue.date = last_update @@ -56,7 +57,7 @@ class InfoStationPage(BasePage): def _create_status_sensor(self, value, gauge_id, last_update, adresse): levelstatus = GaugeSensor(gauge_id + '-status') levelstatus.name = u'Status' - levelstatus.address = u'%s' %adresse + levelstatus.address = u'%s' % adresse lastvalue = GaugeMeasure() status = float(value) if status == 0: @@ -75,21 +76,20 @@ class InfoStationPage(BasePage): def get_station_infos(self, gauge_id): - last_update = self._get_last_update(self.parser.select(self.document.getroot(),'lastupd',1).text) + last_update = self._get_last_update(self.parser.select(self.document.getroot(), 'lastupd', 1).text) sensors = [] - adresse = self.parser.select(self.document.getroot(),'adress',1).text + adresse = self.parser.select(self.document.getroot(), 'adress', 1).text - sensors.append(self._create_bikes_sensor(self.parser.select(self.document.getroot(),'bikes',1).text, gauge_id, last_update, adresse)) + sensors.append(self._create_bikes_sensor(self.parser.select(self.document.getroot(), 'bikes', 1).text, gauge_id, last_update, adresse)) - sensors.append(self._create_attach_sensor(self.parser.select(self.document.getroot(),'attachs',1).text, gauge_id, last_update, adresse)) + sensors.append(self._create_attach_sensor(self.parser.select(self.document.getroot(), 'attachs', 1).text, gauge_id, last_update, adresse)) - sensors.append(self._create_status_sensor(self.parser.select(self.document.getroot(),'status',1).text, gauge_id, last_update, adresse)) - - #print self.parser.select(self.document.getroot(),'paiement',1).text + sensors.append(self._create_status_sensor(self.parser.select(self.document.getroot(), 'status', 1).text, gauge_id, last_update, adresse)) return sensors + class ListStationsPage(BasePage): def get_station_list(self): gauges = [] diff --git a/modules/vlille/test.py b/modules/vlille/test.py index cd78ebde..ae98d59f 100644 --- a/modules/vlille/test.py +++ b/modules/vlille/test.py @@ -19,6 +19,7 @@ from weboob.tools.test import BackendTest + class VlilleTest(BackendTest): BACKEND = 'vlille'