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

pep8 cleaning

Browse source
This commit is contained in:
Florent 2013-10-28 18:35:26 +01:00
commit a74f832d52
3 changed files with 17 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

25
modules/velib/backend.py
View file

@ -37,8 +37,7 @@ class VelibBackend(BaseBackend, ICapGauge):
LICENSE = 'AGPLv3' LICENSE = 'AGPLv3'
BROWSER = VelibBrowser BROWSER = VelibBrowser
STORAGE = {'boards' : {}} STORAGE = {'boards': {}}
def iter_gauges(self, pattern=None): def iter_gauges(self, pattern=None):
if pattern is None: if pattern is None:
@ -80,14 +79,14 @@ class VelibBackend(BaseBackend, ICapGauge):
return None return None
def _get_sensor_by_id(self, id): def _get_sensor_by_id(self, id):
reSensorId = re.search ('(\d+)-((bikes|attach|status))', id, re.IGNORECASE) reSensorId = re.search('(\d+)-((bikes|attach|status))', id, re.IGNORECASE)
if reSensorId: if reSensorId:
gauge = reSensorId.group(1) gauge = reSensorId.group(1)
pattern = reSensorId.group(2) pattern = reSensorId.group(2)
sensor_generator = self.iter_sensors(gauge, pattern) sensor_generator = self.iter_sensors(gauge, pattern)
if sensor_generator: if sensor_generator:
return next(sensor_generator) return next(sensor_generator)
else: else:
return None return None
else: else:
return None return None

1
modules/velib/browser.py
View file

@ -44,4 +44,3 @@ class VelibBrowser(BaseBrowser):
def get_station_infos(self, gauge): def get_station_infos(self, gauge):
self.location('%s://%s/stationdetails/paris/%s' % (self.PROTOCOL, self.DOMAIN, gauge.id)) self.location('%s://%s/stationdetails/paris/%s' % (self.PROTOCOL, self.DOMAIN, gauge.id))
return self.page.get_station_infos(gauge.id) return self.page.get_station_infos(gauge.id)

9
modules/velib/pages.py
View file

@ -28,6 +28,7 @@ __all__ = ['InfoStationPage', 'ListStationsPage']
AdresseStation = {} AdresseStation = {}
class InfoStationPage(BasePage): 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')
@ -83,7 +84,7 @@ class InfoStationPage(BasePage):
sensors = [] sensors = []
last_update = datetime.datetime.fromtimestamp(float(self.parser.select(self.document.getroot(), 'updated', 1).text)) last_update = datetime.datetime.fromtimestamp(float(self.parser.select(self.document.getroot(), 'updated', 1).text))
adresse = AdresseStation[gauge_id] adresse = AdresseStation[gauge_id]
sensors.append(self._create_bikes_sensor(self.parser.select(self.document.getroot(), 'available', 1).text, gauge_id, last_update, adresse)) sensors.append(self._create_bikes_sensor(self.parser.select(self.document.getroot(), 'available', 1).text, gauge_id, last_update, adresse))
sensors.append(self._create_attach_sensor(self.parser.select(self.document.getroot(), 'free', 1).text, gauge_id, last_update, adresse)) sensors.append(self._create_attach_sensor(self.parser.select(self.document.getroot(), 'free', 1).text, gauge_id, last_update, adresse))
@ -99,9 +100,9 @@ class ListStationsPage(BasePage):
gauge = Gauge(int(marker.get('number'))) gauge = Gauge(int(marker.get('number')))
gauge.name = unicode(marker.get('address')).rsplit('-', 1)[0] gauge.name = unicode(marker.get('address')).rsplit('-', 1)[0]
full_address = re.search(r'\d\d\d\d\d.*', unicode(marker.get('fulladdress'))) full_address = re.search(r'\d\d\d\d\d.*', unicode(marker.get('fulladdress')))
if full_address: if full_address:
gauge.city = full_address.group() gauge.city = full_address.group()
gauge.object = u'velib' gauge.object = u'velib'
gauges.append(gauge) gauges.append(gauge)
AdresseStation[marker.get('number')] = marker.get('fulladdress') AdresseStation[marker.get('number')] = marker.get('fulladdress')
return gauges return gauges