diff --git a/scripts/boobank b/scripts/boobank index d4de997996b1081932f2fc372462a80ae45e8805..97043cd9cc4fd6d662ba374d11ac472093586acb 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 f8726bcb22e657d35841d44a11bde4ad33bdfc60..bfc0b6216f6c603ed5f2d46d1dca4fb30bb087e3 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 a6d77a653b8feffa34e1525e4c1117829eed9206..c15105a88ed43337f5170fed46606b3867adab48 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 936713cb9c8c1124ce7ff3e036095e2f0cf61103..cbe095969f655f4f45cfd04b5fbc32a5642ab9fb 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 406fa17d5938aaf3752383e2fc3ba1b1e7450f09..9db1f3c9595442f3f6f5838defebbfa0417e57d2 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 abe52ae8ddbc870e062262089d43e40b3ddd3323..50ce8280522579d3ecfc182f40809580bd153c82 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 9b988b3e187ddf4db21ce506cad1e9b67abb0486..f2b2420fbf3b308853c0aab929335a340d404c35 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 1e1e05abb02d8748014c140d2a3b12a1d25bda05..8dc6dae79a88d9ebf9d8e659ea108fe543f39f26 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 335f33c7ae86ee0b679a00fcab01b7df466828f2..d09d3abcf541fb8c06743da16ef414a1d62ba407 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 34fa77e913d9dafc4ce0fa892056f253a2ee742d..56c11847bf0a6bf72684976d347ab196bf77e885 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 2fa3e379e2d9a7381099bc03f3f46a716a797546..30ab280c2dc89ff6b52d3760a816d6a2bb6b0305 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 0f20dab6c58df55221095addde2737839daad7d8..b0677143c492d6767d1d6421b961b53cff8e2476 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 817277e7f7fedefe7f004ab7f812b61a604fceba..6ad20628a95d5b8733655e96d3265be8f993f9ea 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 956853620bd48c66a3474b9b16f698eefb2b00d1..aec73cdc9898219a581c6783fb04fc7fda863909 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 8db2638593bcf278310b10511175b2738a559f88..8122564453f8b1bbc517091814ba5efe43b62e5b 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 3beabf28b89fef293762410ad823838de3c9882d..946016cb31328eea85994de03e15b76cf007bdae 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 3312e9e92c14cdf1506fd7848913dc1d4fb39c49..f7c601909b570a4e581cb2f5bc5aa9851b5bb3f4 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 79c1cc97c5526e930c2158f07e82398960dcbd16..4a67d147a7815b2500141dc290e1e5024f4e808f 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 2d198ddd176c6864dc1f726df4f49b6b30e4f2bb..b8fa639c53546941389fd2877125a957c6e9b7bc 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 7393fd826b200485d1de233236056903ef5c77ee..cbc5b9fdd4aef2aa26c2c71fb5d15ff3f960ee33 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 9ea37b2f5df8e2e913e5dcfa4ab0e06704c8cf78..14ce2ffa6c6ec205631f0c1013c10999ed337367 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 a2809580afc9c8dcc595ceb840b665c43bc80d90..8b81262b16c9e89a30ea879240dd19bd1d99ee7c 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 a2ea509f1a534c9f9ef8d9cfda78e4cf24814f2a..766d4e27e7bb12a5873252cd3cbbd1a3166e44b4 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 405041923a524f446dfac990abaa4dd7a80e1886..a5c5223aa3aacd131c36e3f08afaa8f19b97aea5 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 617f9d09f036be896b68dbb3bb064be08877257c..869e60c3c4a66ed00bbcf710cefc598d03bcd41a 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 6975339d9aa16bd6768ecfe761a7c81026762b3c..65a19246c5ae4af90cf523b9b2df30dc0aacc7c2 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 959660b0aa1feb93e1a0209901cf416909275a4e..5ae45df9808300ae7c509cd4f501c272b37b9b71 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 c4871f56c3a7822f8a7633641147305bf9e3f41b..49b0f7051d2085556850cc94793c360b88658d13 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 5e740bcdfa27532678c77508c74eb9e6023f5743..4ea99726ce73d8b31d6a51104893b8d103e0bd58 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 1ecf53807be8545cd91bcadf7a7e88e14a28681a..b2062b0edbe5c8924491be51f6074ff1d7bd2b0a 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 5e20e340151b06719f3c10faeac4e6880b9a7e4d..b860694b84f716eff785ed40572f5102cf1bba3c 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 3715dd03a182d21ae154f95665969f05b9f6b314..21398d0b565fd41d67c67b158602825e08aa3c6c 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 2d4ee9d482632ef5c3aa1657e76a3058a8811019..7e278bafe5160b113e87b8d3069195f9860fe828 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 0f86a8ad21ad864e7549790da34954054acff89a..ae07d92e438fd9b36089a9097e39be6cf65d7566 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 246ce696f3233c1c1f9d2a2ad0cf288e37fb27c0..325b1f2597bade2617a58fdda0271ec00e94d5bc 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 01fa6713fc29309689e89a0bade006ed6cd4fd54..d63ba6e46975ce13ba460849f546c7a82ffab0dd 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 8bb9d92030fc72c81e30a54fb0f0a618484dc45f..e132235cacbabf25c7c3b9f9fc9fd46342cacab8 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 742d10102578c93b99ea8536c3980016eb734782..b1892eba1597227285688a0642d82ee580ff702e 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 045c22127f57ccad15ccf15de2b2dffc8f049e5d..b8127af86d8ecddc11cbd73a68239a8823046bde 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 33e3dd62a143865ab8f1132b156485aad1e9128f..634f41b247d513e00d2923497f5281325c38672c 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 07a47572909cbd922229fa12517257daa36071db..6ebe05769727d9c8a87329f1a098e8788cfde81f 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 63310474b7e787268d297f9b47747409a59e77fb..d4fe7ef912bbb07dca54fceacb43047d2930a6ea 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 afe09433fa16e84786b9c62b541680797e36e727..c0aeb4743bd46a931868d51a1bf4d2897c678548 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 2283f2b47c80d371da5f6bc7226d4d94fd7e28eb..6a2daac1b83831dea02cf7f71b1e238aba6ea0e7 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 baef99696356919704f1798cbc8ee016d2134c72..e86cf61555a838bfc29e90312da54893eddec49a 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