From f5f6799633c21746cb23571768c475e8316e6d5a Mon Sep 17 00:00:00 2001 From: Romain Bignon Date: Wed, 14 Apr 2010 20:59:12 +0200 Subject: [PATCH 1/3] import parsers only if library used is available --- weboob/tools/parser/__init__.py | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/weboob/tools/parser/__init__.py b/weboob/tools/parser/__init__.py index f30cfb22..5915b6da 100644 --- a/weboob/tools/parser/__init__.py +++ b/weboob/tools/parser/__init__.py @@ -18,7 +18,17 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. """ -from .elementtidyparser import ElementTidyParser -from .html5libparser import Html5libParser -from .lxmlparser import LxmlHtmlParser from .standardparser import StandardParser, tostring + +try: + from .elementtidyparser import ElementTidyParser +except ImportError: + pass +try: + from .html5libparser import Html5libParser +except ImportError: + pass +try: + from .lxmlparser import LxmlHtmlParser +except ImportError: + pass From d5d360bdcf46cba5616d0bea726229092586ba12 Mon Sep 17 00:00:00 2001 From: Romain Bignon Date: Wed, 14 Apr 2010 23:50:52 +0200 Subject: [PATCH 2/3] fix instanciation of parser --- weboob/backends/transilien/browser.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/weboob/backends/transilien/browser.py b/weboob/backends/transilien/browser.py index e6451b16..095bd233 100644 --- a/weboob/backends/transilien/browser.py +++ b/weboob/backends/transilien/browser.py @@ -122,7 +122,7 @@ class Transilien(Browser): } def __init__(self): - Browser.__init__(self, '', parser=Parser) + Browser.__init__(self, '', parser=Parser()) def iter_station_search(self, pattern): pass From 86d227fd6ee27b8ed4c20ef5f6bddfbce32b9281 Mon Sep 17 00:00:00 2001 From: Juke Date: Thu, 15 Apr 2010 12:41:45 +0200 Subject: [PATCH 3/3] loop optimisation --- weboob/frontends/travel_ui/application.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/weboob/frontends/travel_ui/application.py b/weboob/frontends/travel_ui/application.py index 6d4a795c..f73bc0f7 100644 --- a/weboob/frontends/travel_ui/application.py +++ b/weboob/frontends/travel_ui/application.py @@ -87,7 +87,7 @@ class TransilienUI(): liste = [] #liste = ConfFile('/opt/masstransit/masstransit.cfg').config.items('ListeDesGares') - for name, backend in self.weboob.iter_backends(): + for None, backend in self.weboob.iter_backends(): for station in backend.iter_station_search(""): liste.append(station) @@ -143,11 +143,10 @@ class TransilienUI(): self.treestore.clear() for name, backend in self.weboob.iter_backends(): for station in backend.iter_station_search(self.combo_source.get_current_text()): - for name, backend in self.weboob.iter_backends(): - for arrival in backend.iter_station_search(self.combo_dest.get_current_text()): - for name, backend, in self.weboob.iter_backends(): - for departure in backend.iter_station_departures(station.id, arrival.id): - self.treestore.append(None, [departure.type, departure.time, departure.arrival_station, departure.information]) + for arrival in backend.iter_station_search(self.combo_dest.get_current_text()): + for departure in backend.iter_station_departures(station.id, arrival.id): + self.treestore.append(None, [departure.type, departure.time, departure.arrival_station, departure.information]) + class Travel(BaseApplication): APPNAME = 'travel'