From 5d4a84afc16e58d021289c0377b0eae38de3268a Mon Sep 17 00:00:00 2001 From: Laurent Bachelier Date: Sun, 1 Dec 2019 18:49:27 +0100 Subject: [PATCH] ilmatieteenlaitos: Fix build with Python 3 Otherwise untested --- modules/ilmatieteenlaitos/pages.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/modules/ilmatieteenlaitos/pages.py b/modules/ilmatieteenlaitos/pages.py index ad8390357c..a1594c119a 100644 --- a/modules/ilmatieteenlaitos/pages.py +++ b/modules/ilmatieteenlaitos/pages.py @@ -18,13 +18,14 @@ # along with this weboob module. If not, see . from datetime import date -from itertools import imap, ifilter -from weboob.browser.pages import JsonPage, HTMLPage +from six.moves import filter, map + from weboob.browser.elements import ItemElement, ListElement, method -from weboob.capabilities.weather import Forecast, Current, City, Temperature from weboob.browser.filters.json import Dict -from weboob.browser.filters.standard import Filter, CleanText +from weboob.browser.filters.standard import CleanText, Filter +from weboob.browser.pages import HTMLPage, JsonPage +from weboob.capabilities.weather import City, Current, Forecast, Temperature class Id(Filter): @@ -100,9 +101,9 @@ def descriptive_text_for_hour(hour): def info_for_value(value): return CleanText(value % offset)(self).replace(u'edeltävän tunnin ', u'') - return ("klo %s: " % hour) + ", ".join(ifilter(bool, imap(info_for_value, values))) + return ("klo %s: " % hour) + ", ".join(filter(bool, map(info_for_value, values))) - return u'\n' + u'\n'.join(ifilter(bool, imap(descriptive_text_for_hour, ["02", "03", "14", "15"]))) + return u'\n' + u'\n'.join(filter(bool, map(descriptive_text_for_hour, ["02", "03", "14", "15"]))) def get_station_id(self): return CleanText(u'//select[@id="observation-station-menu"]/option[@selected="selected"]/@value')(self.doc) -- GitLab