diff --git a/modules/velib/backend.py b/modules/velib/backend.py index a046538c..a1efa77b 100644 --- a/modules/velib/backend.py +++ b/modules/velib/backend.py @@ -37,8 +37,7 @@ class VelibBackend(BaseBackend, ICapGauge): LICENSE = 'AGPLv3' BROWSER = VelibBrowser - STORAGE = {'boards' : {}} - + STORAGE = {'boards': {}} def iter_gauges(self, pattern=None): if pattern is None: @@ -80,14 +79,14 @@ class VelibBackend(BaseBackend, ICapGauge): return None def _get_sensor_by_id(self, id): - reSensorId = re.search ('(\d+)-((bikes|attach|status))', id, re.IGNORECASE) - if reSensorId: - gauge = reSensorId.group(1) - pattern = reSensorId.group(2) - sensor_generator = self.iter_sensors(gauge, pattern) - if sensor_generator: - return next(sensor_generator) - else: - return None - else: - return None + reSensorId = re.search('(\d+)-((bikes|attach|status))', id, re.IGNORECASE) + if reSensorId: + gauge = reSensorId.group(1) + pattern = reSensorId.group(2) + sensor_generator = self.iter_sensors(gauge, pattern) + if sensor_generator: + return next(sensor_generator) + else: + return None + else: + return None diff --git a/modules/velib/browser.py b/modules/velib/browser.py index 1e7fe792..a93aea23 100644 --- a/modules/velib/browser.py +++ b/modules/velib/browser.py @@ -44,4 +44,3 @@ class VelibBrowser(BaseBrowser): def get_station_infos(self, gauge): self.location('%s://%s/stationdetails/paris/%s' % (self.PROTOCOL, self.DOMAIN, gauge.id)) return self.page.get_station_infos(gauge.id) - diff --git a/modules/velib/pages.py b/modules/velib/pages.py index 1e900df4..8f7f7c77 100644 --- a/modules/velib/pages.py +++ b/modules/velib/pages.py @@ -28,6 +28,7 @@ __all__ = ['InfoStationPage', 'ListStationsPage'] AdresseStation = {} + class InfoStationPage(BasePage): def _create_bikes_sensor(self, value, gauge_id, last_update, adresse): levelbikes = GaugeSensor(gauge_id + '-bikes') @@ -83,7 +84,7 @@ class InfoStationPage(BasePage): sensors = [] 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_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.name = unicode(marker.get('address')).rsplit('-', 1)[0] full_address = re.search(r'\d\d\d\d\d.*', unicode(marker.get('fulladdress'))) - if full_address: - gauge.city = full_address.group() + if full_address: + gauge.city = full_address.group() gauge.object = u'velib' gauges.append(gauge) - AdresseStation[marker.get('number')] = marker.get('fulladdress') + AdresseStation[marker.get('number')] = marker.get('fulladdress') return gauges