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

Some cleaning

Browse source
This commit is contained in:
Florent 2014-03-19 17:04:49 +01:00
commit 492cc0e63b
3 changed files with 3 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

3
modules/sachsen/backend.py
View file

@ -17,9 +17,6 @@
# You should have received a copy of the GNU Affero General Public License # You should have received a copy of the GNU Affero General Public License
# along with weboob. If not, see <http://www.gnu.org/licenses/>. # along with weboob. If not, see <http://www.gnu.org/licenses/>.
from .browser import SachsenBrowser from .browser import SachsenBrowser
from weboob.capabilities.gauge import ICapGauge, GaugeSensor, Gauge,\ from weboob.capabilities.gauge import ICapGauge, GaugeSensor, Gauge,\
SensorNotFound SensorNotFound

3
modules/sachsen/browser.py
View file

@ -36,5 +36,4 @@ class SachsenBrowser(PagesBrowser):
def iter_history(self, sensor, **kwargs): def iter_history(self, sensor, **kwargs):
self.history.go(params=int(sensor.gaugeid)) self.history.go(params=int(sensor.gaugeid))
kwargs['sensor'] = sensor return self.page.iter_history(sensor=sensor)
return self.page.iter_history(**kwargs)

5
modules/sachsen/pages.py
View file

@ -39,7 +39,7 @@ class ListPage(HTMLPage):
forecasts = {'pf_gerade.png': u'stable', forecasts = {'pf_gerade.png': u'stable',
'pf_unten.png': u'Go down', 'pf_unten.png': u'Go down',
'pf_oben.png': u'Go up', 'pf_oben.png': u'Go up',
} }
alarmlevel = {"as1.gif": u"Alarmstufe 1", "as2.gif": u"Alarmstufe 2", alarmlevel = {"as1.gif": u"Alarmstufe 1", "as2.gif": u"Alarmstufe 2",
"as3.gif": u"Alarmstufe 3", "as4.gig": u"Alarmstufe 4", "as3.gif": u"Alarmstufe 3", "as4.gig": u"Alarmstufe 4",
"qua_grau.gif": u"No alarm function", "p_gruen.gif": u"", "qua_grau.gif": u"No alarm function", "p_gruen.gif": u"",
@ -109,10 +109,9 @@ class HistoryPage(HTMLPage):
def condition(self): def condition(self):
return self.verif.match(self.el[0].text_content()) return self.verif.match(self.el[0].text_content())
obj_id = None
obj_date = Date(Regexp(CleanText('.'), r'(\d+)\.(\d+)\.(\d+) (\d+):(\d+)', r'\3-\2-\1 \4:\5')) obj_date = Date(Regexp(CleanText('.'), r'(\d+)\.(\d+)\.(\d+) (\d+):(\d+)', r'\3-\2-\1 \4:\5'))
sensor_types = [u'Level', u'Flow'] sensor_types = [u'Level', u'Flow']
def obj_level(self): def obj_level(self):
index = self.sensor_types.index(self.env['sensor'].name) + 1 index = self.sensor_types.index(self.env['sensor'].name) + 1
try: try: