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

Some pep8 cleaning

Browse source
This commit is contained in:
Florent 2013-05-23 17:01:51 +02:00
commit be6c5356d5
3 changed files with 14 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

3
modules/vlille/backend.py
View file

@ -19,12 +19,13 @@
from weboob.tools.backend import BaseBackend 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 from .browser import VlilleBrowser
__all__ = ['VlilleBackend'] __all__ = ['VlilleBackend']
class VlilleBackend(BaseBackend, ICapGauge): class VlilleBackend(BaseBackend, ICapGauge):
NAME = 'vlille' NAME = 'vlille'
DESCRIPTION = u'accès aux données vlille' DESCRIPTION = u'accès aux données vlille'

22
modules/vlille/pages.py
View file

@ -21,7 +21,8 @@
from weboob.tools.browser import BasePage from weboob.tools.browser import BasePage
from weboob.capabilities.gauge import Gauge, GaugeMeasure, GaugeSensor from weboob.capabilities.gauge import Gauge, GaugeMeasure, GaugeSensor
from weboob.capabilities.base import NotLoaded from weboob.capabilities.base import NotLoaded
import datetime, re import datetime
import re
__all__ = ['InfoStationPage', 'ListStationsPage'] __all__ = ['InfoStationPage', 'ListStationsPage']
@ -30,7 +31,7 @@ class InfoStationPage(BasePage):
def _create_bikes_sensor(self, value, gauge_id, last_update, adresse): def _create_bikes_sensor(self, value, gauge_id, last_update, adresse):
levelbikes = GaugeSensor(gauge_id + '-bikes') levelbikes = GaugeSensor(gauge_id + '-bikes')
levelbikes.name = u'Bikes' levelbikes.name = u'Bikes'
levelbikes.address = u'%s' %adresse levelbikes.address = u'%s' % adresse
lastvalue = GaugeMeasure() lastvalue = GaugeMeasure()
lastvalue.level = float(value) lastvalue.level = float(value)
lastvalue.date = last_update lastvalue.date = last_update
@ -44,7 +45,7 @@ class InfoStationPage(BasePage):
def _create_attach_sensor(self, value, gauge_id, last_update, adresse): def _create_attach_sensor(self, value, gauge_id, last_update, adresse):
levelattach = GaugeSensor(gauge_id + '-attach') levelattach = GaugeSensor(gauge_id + '-attach')
levelattach.name = u'Attach' levelattach.name = u'Attach'
levelattach.address = u'%s' %adresse levelattach.address = u'%s' % adresse
lastvalue = GaugeMeasure() lastvalue = GaugeMeasure()
lastvalue.level = float(value) lastvalue.level = float(value)
lastvalue.date = last_update lastvalue.date = last_update
@ -56,7 +57,7 @@ class InfoStationPage(BasePage):
def _create_status_sensor(self, value, gauge_id, last_update, adresse): def _create_status_sensor(self, value, gauge_id, last_update, adresse):
levelstatus = GaugeSensor(gauge_id + '-status') levelstatus = GaugeSensor(gauge_id + '-status')
levelstatus.name = u'Status' levelstatus.name = u'Status'
levelstatus.address = u'%s' %adresse levelstatus.address = u'%s' % adresse
lastvalue = GaugeMeasure() lastvalue = GaugeMeasure()
status = float(value) status = float(value)
if status == 0: if status == 0:
@ -75,21 +76,20 @@ class InfoStationPage(BasePage):
def get_station_infos(self, gauge_id): 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 = [] 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)) 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
return sensors return sensors
class ListStationsPage(BasePage): class ListStationsPage(BasePage):
def get_station_list(self): def get_station_list(self):
gauges = [] gauges = []

1
modules/vlille/test.py
View file

@ -19,6 +19,7 @@
from weboob.tools.test import BackendTest from weboob.tools.test import BackendTest
class VlilleTest(BackendTest): class VlilleTest(BackendTest):
BACKEND = 'vlille' BACKEND = 'vlille'