From 74a47accd691c7a428b4c4abec623d280af820f9 Mon Sep 17 00:00:00 2001 From: Romain Bignon Date: Sun, 8 Jan 2017 18:56:06 +0100 Subject: [PATCH] add 'absolute_import' pragma in all scripts That's because of the 'weboob' script which can be considered as a module --- scripts/boobank | 2 +- scripts/boobathon | 1 + scripts/boobcoming | 1 + scripts/boobill | 1 + scripts/booblyrics | 1 + scripts/boobmsg | 1 + scripts/boobooks | 1 + scripts/boobsize | 1 + scripts/boobtracker | 1 + scripts/cineoob | 1 + scripts/comparoob | 1 + scripts/cookboob | 1 + scripts/flatboob | 1 + scripts/galleroob | 1 + scripts/geolooc | 1 + scripts/handjoob | 1 + scripts/havedate | 1 + scripts/masstransit | 1 + scripts/monboob | 1 + scripts/parceloob | 1 + scripts/pastoob | 1 + scripts/qbooblyrics | 1 + scripts/qboobmsg | 1 + scripts/qcineoob | 1 + scripts/qcookboob | 1 + scripts/qflatboob | 1 + scripts/qhandjoob | 1 + scripts/qhavedate | 1 + scripts/qvideoob | 1 + scripts/qwebcontentedit | 1 + scripts/radioob | 1 + scripts/shopoob | 1 + scripts/suboob | 1 + scripts/translaboob | 1 + scripts/traveloob | 1 + scripts/videoob | 1 + scripts/webcontentedit | 1 + scripts/weboob | 17 +++++++++++++---- scripts/weboob-cli | 1 + scripts/weboob-config | 1 + scripts/weboob-config-qt | 1 + scripts/weboob-debug | 1 + scripts/weboob-repos | 1 + scripts/weboorrents | 1 + scripts/wetboobs | 1 + 45 files changed, 57 insertions(+), 5 deletions(-) diff --git a/scripts/boobank b/scripts/boobank index d4de997996..97043cd9cc 100755 --- a/scripts/boobank +++ b/scripts/boobank @@ -19,7 +19,7 @@ # You should have received a copy of the GNU Affero General Public License # along with weboob. If not, see . - +from __future__ import absolute_import from weboob.applications.boobank import Boobank diff --git a/scripts/boobathon b/scripts/boobathon index f8726bcb22..bfc0b6216f 100755 --- a/scripts/boobathon +++ b/scripts/boobathon @@ -20,6 +20,7 @@ # along with weboob. If not, see . +from __future__ import absolute_import from weboob.applications.boobathon import Boobathon diff --git a/scripts/boobcoming b/scripts/boobcoming index a6d77a653b..c15105a88e 100755 --- a/scripts/boobcoming +++ b/scripts/boobcoming @@ -19,6 +19,7 @@ # along with weboob. If not, see . +from __future__ import absolute_import from weboob.applications.boobcoming import Boobcoming if __name__ == '__main__': diff --git a/scripts/boobill b/scripts/boobill index 936713cb9c..cbe095969f 100755 --- a/scripts/boobill +++ b/scripts/boobill @@ -20,6 +20,7 @@ # along with weboob. If not, see . +from __future__ import absolute_import from weboob.applications.boobill import Boobill diff --git a/scripts/booblyrics b/scripts/booblyrics index 406fa17d59..9db1f3c959 100755 --- a/scripts/booblyrics +++ b/scripts/booblyrics @@ -20,6 +20,7 @@ # along with weboob. If not, see . +from __future__ import absolute_import from weboob.applications.booblyrics import Booblyrics diff --git a/scripts/boobmsg b/scripts/boobmsg index abe52ae8dd..50ce828052 100755 --- a/scripts/boobmsg +++ b/scripts/boobmsg @@ -20,6 +20,7 @@ # along with weboob. If not, see . +from __future__ import absolute_import from weboob.applications.boobmsg import Boobmsg diff --git a/scripts/boobooks b/scripts/boobooks index 9b988b3e18..f2b2420fbf 100755 --- a/scripts/boobooks +++ b/scripts/boobooks @@ -20,6 +20,7 @@ # along with weboob. If not, see . +from __future__ import absolute_import from weboob.applications.boobooks import Boobooks diff --git a/scripts/boobsize b/scripts/boobsize index 1e1e05abb0..8dc6dae79a 100755 --- a/scripts/boobsize +++ b/scripts/boobsize @@ -20,6 +20,7 @@ # along with weboob. If not, see . +from __future__ import absolute_import from weboob.applications.boobsize import Boobsize diff --git a/scripts/boobtracker b/scripts/boobtracker index 335f33c7ae..d09d3abcf5 100755 --- a/scripts/boobtracker +++ b/scripts/boobtracker @@ -18,6 +18,7 @@ # You should have received a copy of the GNU Affero General Public License # along with weboob. If not, see . +from __future__ import absolute_import from weboob.applications.boobtracker import BoobTracker diff --git a/scripts/cineoob b/scripts/cineoob index 34fa77e913..56c11847bf 100755 --- a/scripts/cineoob +++ b/scripts/cineoob @@ -20,6 +20,7 @@ # along with weboob. If not, see . +from __future__ import absolute_import from weboob.applications.cineoob import Cineoob diff --git a/scripts/comparoob b/scripts/comparoob index 2fa3e379e2..30ab280c2d 100755 --- a/scripts/comparoob +++ b/scripts/comparoob @@ -2,6 +2,7 @@ # -*- coding: utf-8 -*- # vim: ft=python et softtabstop=4 cinoptions=4 shiftwidth=4 ts=4 ai +from __future__ import absolute_import from weboob.applications.comparoob import Comparoob diff --git a/scripts/cookboob b/scripts/cookboob index 0f20dab6c5..b0677143c4 100755 --- a/scripts/cookboob +++ b/scripts/cookboob @@ -20,6 +20,7 @@ # along with weboob. If not, see . +from __future__ import absolute_import from weboob.applications.cookboob import Cookboob diff --git a/scripts/flatboob b/scripts/flatboob index 817277e7f7..6ad20628a9 100755 --- a/scripts/flatboob +++ b/scripts/flatboob @@ -20,6 +20,7 @@ # along with weboob. If not, see . +from __future__ import absolute_import from weboob.applications.flatboob import Flatboob diff --git a/scripts/galleroob b/scripts/galleroob index 956853620b..aec73cdc98 100755 --- a/scripts/galleroob +++ b/scripts/galleroob @@ -18,6 +18,7 @@ # You should have received a copy of the GNU Affero General Public License # along with weboob. If not, see . +from __future__ import absolute_import from weboob.applications.galleroob import Galleroob diff --git a/scripts/geolooc b/scripts/geolooc index 8db2638593..8122564453 100755 --- a/scripts/geolooc +++ b/scripts/geolooc @@ -20,6 +20,7 @@ # along with weboob. If not, see . +from __future__ import absolute_import from weboob.applications.geolooc import Geolooc diff --git a/scripts/handjoob b/scripts/handjoob index 3beabf28b8..946016cb31 100755 --- a/scripts/handjoob +++ b/scripts/handjoob @@ -19,6 +19,7 @@ # along with weboob. If not, see . +from __future__ import absolute_import from weboob.applications.handjoob import Handjoob diff --git a/scripts/havedate b/scripts/havedate index 3312e9e92c..f7c601909b 100755 --- a/scripts/havedate +++ b/scripts/havedate @@ -20,6 +20,7 @@ # along with weboob. If not, see . +from __future__ import absolute_import from weboob.applications.havedate import HaveDate diff --git a/scripts/masstransit b/scripts/masstransit index 79c1cc97c5..4a67d147a7 100755 --- a/scripts/masstransit +++ b/scripts/masstransit @@ -20,6 +20,7 @@ # along with weboob. If not, see . +from __future__ import absolute_import from weboob.applications.masstransit import Masstransit diff --git a/scripts/monboob b/scripts/monboob index 2d198ddd17..b8fa639c53 100755 --- a/scripts/monboob +++ b/scripts/monboob @@ -20,6 +20,7 @@ # along with weboob. If not, see . +from __future__ import absolute_import from weboob.applications.monboob import Monboob diff --git a/scripts/parceloob b/scripts/parceloob index 7393fd826b..cbc5b9fdd4 100755 --- a/scripts/parceloob +++ b/scripts/parceloob @@ -20,6 +20,7 @@ # along with weboob. If not, see . +from __future__ import absolute_import from weboob.applications.parceloob import Parceloob diff --git a/scripts/pastoob b/scripts/pastoob index 9ea37b2f5d..14ce2ffa6c 100755 --- a/scripts/pastoob +++ b/scripts/pastoob @@ -20,6 +20,7 @@ # along with weboob. If not, see . +from __future__ import absolute_import from weboob.applications.pastoob import Pastoob diff --git a/scripts/qbooblyrics b/scripts/qbooblyrics index a2809580af..8b81262b16 100755 --- a/scripts/qbooblyrics +++ b/scripts/qbooblyrics @@ -20,6 +20,7 @@ # along with weboob. If not, see . +from __future__ import absolute_import from weboob.applications.qbooblyrics import QBooblyrics diff --git a/scripts/qboobmsg b/scripts/qboobmsg index a2ea509f1a..766d4e27e7 100755 --- a/scripts/qboobmsg +++ b/scripts/qboobmsg @@ -20,6 +20,7 @@ # along with weboob. If not, see . +from __future__ import absolute_import from weboob.applications.qboobmsg import QBoobMsg diff --git a/scripts/qcineoob b/scripts/qcineoob index 405041923a..a5c5223aa3 100755 --- a/scripts/qcineoob +++ b/scripts/qcineoob @@ -20,6 +20,7 @@ # along with weboob. If not, see . +from __future__ import absolute_import from weboob.applications.qcineoob import QCineoob diff --git a/scripts/qcookboob b/scripts/qcookboob index 617f9d09f0..869e60c3c4 100755 --- a/scripts/qcookboob +++ b/scripts/qcookboob @@ -20,6 +20,7 @@ # along with weboob. If not, see . +from __future__ import absolute_import from weboob.applications.qcookboob import QCookboob diff --git a/scripts/qflatboob b/scripts/qflatboob index 6975339d9a..65a19246c5 100755 --- a/scripts/qflatboob +++ b/scripts/qflatboob @@ -20,6 +20,7 @@ # along with weboob. If not, see . +from __future__ import absolute_import from weboob.applications.qflatboob import QFlatBoob diff --git a/scripts/qhandjoob b/scripts/qhandjoob index 959660b0aa..5ae45df980 100755 --- a/scripts/qhandjoob +++ b/scripts/qhandjoob @@ -20,6 +20,7 @@ # along with weboob. If not, see . +from __future__ import absolute_import from weboob.applications.qhandjoob import QHandJoob diff --git a/scripts/qhavedate b/scripts/qhavedate index c4871f56c3..49b0f7051d 100755 --- a/scripts/qhavedate +++ b/scripts/qhavedate @@ -20,6 +20,7 @@ # along with weboob. If not, see . +from __future__ import absolute_import from weboob.applications.qhavedate import QHaveDate diff --git a/scripts/qvideoob b/scripts/qvideoob index 5e740bcdfa..4ea99726ce 100755 --- a/scripts/qvideoob +++ b/scripts/qvideoob @@ -20,6 +20,7 @@ # along with weboob. If not, see . +from __future__ import absolute_import from weboob.applications.qvideoob import QVideoob diff --git a/scripts/qwebcontentedit b/scripts/qwebcontentedit index 1ecf53807b..b2062b0edb 100755 --- a/scripts/qwebcontentedit +++ b/scripts/qwebcontentedit @@ -20,6 +20,7 @@ # along with weboob. If not, see . +from __future__ import absolute_import from weboob.applications.qwebcontentedit import QWebContentEdit diff --git a/scripts/radioob b/scripts/radioob index 5e20e34015..b860694b84 100755 --- a/scripts/radioob +++ b/scripts/radioob @@ -20,6 +20,7 @@ # along with weboob. If not, see . +from __future__ import absolute_import from weboob.applications.radioob import Radioob diff --git a/scripts/shopoob b/scripts/shopoob index 3715dd03a1..21398d0b56 100755 --- a/scripts/shopoob +++ b/scripts/shopoob @@ -20,6 +20,7 @@ # along with weboob. If not, see . +from __future__ import absolute_import from weboob.applications.shopoob import Shopoob diff --git a/scripts/suboob b/scripts/suboob index 2d4ee9d482..7e278bafe5 100755 --- a/scripts/suboob +++ b/scripts/suboob @@ -20,6 +20,7 @@ # along with weboob. If not, see . +from __future__ import absolute_import from weboob.applications.suboob import Suboob diff --git a/scripts/translaboob b/scripts/translaboob index 0f86a8ad21..ae07d92e43 100755 --- a/scripts/translaboob +++ b/scripts/translaboob @@ -19,6 +19,7 @@ # along with weboob. If not, see . +from __future__ import absolute_import from weboob.applications.translaboob import Translaboob diff --git a/scripts/traveloob b/scripts/traveloob index 246ce696f3..325b1f2597 100755 --- a/scripts/traveloob +++ b/scripts/traveloob @@ -20,6 +20,7 @@ # along with weboob. If not, see . +from __future__ import absolute_import from weboob.applications.traveloob import Traveloob diff --git a/scripts/videoob b/scripts/videoob index 01fa6713fc..d63ba6e469 100755 --- a/scripts/videoob +++ b/scripts/videoob @@ -20,6 +20,7 @@ # along with weboob. If not, see . +from __future__ import absolute_import from weboob.applications.videoob import Videoob diff --git a/scripts/webcontentedit b/scripts/webcontentedit index 8bb9d92030..e132235cac 100755 --- a/scripts/webcontentedit +++ b/scripts/webcontentedit @@ -20,6 +20,7 @@ # along with weboob. If not, see . +from __future__ import absolute_import from weboob.applications.webcontentedit import WebContentEdit diff --git a/scripts/weboob b/scripts/weboob index 742d101025..b1892eba15 100755 --- a/scripts/weboob +++ b/scripts/weboob @@ -3,7 +3,7 @@ # vim: ft=python et softtabstop=4 cinoptions=4 shiftwidth=4 ts=4 ai -# Copyright(C) 2009-2011 Romain Bignon +# Copyright(C) 2009-2017 Romain Bignon # # This file is part of weboob. # @@ -20,6 +20,8 @@ # You should have received a copy of the GNU Affero General Public License # along with weboob. If not, see . +from __future__ import absolute_import + import re import os import sys @@ -32,12 +34,19 @@ from weboob.tools.ordereddict import OrderedDict from weboob.tools.application.console import ConsoleApplication +__all__ = ['Weboob'] + + class Weboob(ConsoleApplication): + APPNAME = 'weboob' + VERSION = '1.2' + COPYRIGHT = 'Copyright(C) 2010-YEAR The Weboob Team' + DESCRIPTION = "This is a console script to launch weboob applications," + SHORT_DESCRIPTION = "launch weboob applications" UPDATE_DAYS_DELAY = 20 - def __init__(self): - super(Weboob, self).__init__() + def main(self): self.update() capApplicationDict = self.init_CapApplicationDict() @@ -156,6 +165,6 @@ class Weboob(ConsoleApplication): if __name__ == '__main__': try: - Weboob() + Weboob().main() except KeyboardInterrupt: print('') diff --git a/scripts/weboob-cli b/scripts/weboob-cli index 045c22127f..b8127af86d 100755 --- a/scripts/weboob-cli +++ b/scripts/weboob-cli @@ -20,6 +20,7 @@ # along with weboob. If not, see . +from __future__ import absolute_import from weboob.applications.weboobcli import WeboobCli diff --git a/scripts/weboob-config b/scripts/weboob-config index 33e3dd62a1..634f41b247 100755 --- a/scripts/weboob-config +++ b/scripts/weboob-config @@ -20,6 +20,7 @@ # along with weboob. If not, see . +from __future__ import absolute_import from weboob.applications.weboobcfg import WeboobCfg diff --git a/scripts/weboob-config-qt b/scripts/weboob-config-qt index 07a4757290..6ebe057697 100755 --- a/scripts/weboob-config-qt +++ b/scripts/weboob-config-qt @@ -20,6 +20,7 @@ # along with weboob. If not, see . +from __future__ import absolute_import from weboob.applications.qweboobcfg import QWeboobCfg diff --git a/scripts/weboob-debug b/scripts/weboob-debug index 63310474b7..d4fe7ef912 100755 --- a/scripts/weboob-debug +++ b/scripts/weboob-debug @@ -20,6 +20,7 @@ # along with weboob. If not, see . +from __future__ import absolute_import from weboob.applications.weboobdebug import WeboobDebug diff --git a/scripts/weboob-repos b/scripts/weboob-repos index afe09433fa..c0aeb4743b 100755 --- a/scripts/weboob-repos +++ b/scripts/weboob-repos @@ -20,6 +20,7 @@ # along with weboob. If not, see . +from __future__ import absolute_import from weboob.applications.weboobrepos import WeboobRepos diff --git a/scripts/weboorrents b/scripts/weboorrents index 2283f2b47c..6a2daac1b8 100755 --- a/scripts/weboorrents +++ b/scripts/weboorrents @@ -20,6 +20,7 @@ # along with weboob. If not, see . +from __future__ import absolute_import from weboob.applications.weboorrents import Weboorrents diff --git a/scripts/wetboobs b/scripts/wetboobs index baef996963..e86cf61555 100755 --- a/scripts/wetboobs +++ b/scripts/wetboobs @@ -20,6 +20,7 @@ # along with weboob. If not, see . +from __future__ import absolute_import from weboob.applications.wetboobs import WetBoobs -- GitLab