diff --git a/weboob/__init__.py b/weboob/__init__.py index 5dd51a8499ad79bd6fe86f26c1fd79d142baf2b9..81a25e1aaa3e2ee62744358745d550f3f8acad22 100644 --- a/weboob/__init__.py +++ b/weboob/__init__.py @@ -1,11 +1,27 @@ # -*- coding: utf-8 -*- -from datetime import datetime -import pkgutil +# Copyright(C) 2010-2021 Romain Bignon +# +# This file is part of woob. +# +# woob is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# woob is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public License +# along with woob. If not, see . -__path__ = pkgutil.extend_path(__path__, __name__) +import woob -__title__ = 'woob' -__version__ = '2.1' -__author__ = 'The Woob Association' -__copyright__ = 'Copyright(C) 2010-%s The Woob Team' % datetime.today().year + +__path__ = woob.__path__ +__title__ = woob.__title__ +__version__ = woob.__version__ +__author__ = woob.__author__ +__copyright__ = woob.__copyright__ diff --git a/woob/__init__.py b/woob/__init__.py index 8d60377d296d810d230a977213d7a07d7b337dce..5dd51a8499ad79bd6fe86f26c1fd79d142baf2b9 100644 --- a/woob/__init__.py +++ b/woob/__init__.py @@ -1,27 +1,11 @@ # -*- coding: utf-8 -*- -# Copyright(C) 2010-2021 Romain Bignon -# -# This file is part of woob. -# -# woob is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# woob is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public License -# along with woob. If not, see . +from datetime import datetime +import pkgutil -import weboob +__path__ = pkgutil.extend_path(__path__, __name__) - -__path__ = weboob.__path__ -__title__ = weboob.__title__ -__version__ = weboob.__version__ -__author__ = weboob.__author__ -__copyright__ = weboob.__copyright__ +__title__ = 'woob' +__version__ = '2.1' +__author__ = 'The Woob Association' +__copyright__ = 'Copyright(C) 2010-%s The Woob Team' % datetime.today().year diff --git a/weboob/applications/__init__.py b/woob/applications/__init__.py similarity index 100% rename from weboob/applications/__init__.py rename to woob/applications/__init__.py diff --git a/weboob/applications/bands/__init__.py b/woob/applications/bands/__init__.py similarity index 100% rename from weboob/applications/bands/__init__.py rename to woob/applications/bands/__init__.py diff --git a/weboob/applications/bands/bands.py b/woob/applications/bands/bands.py similarity index 96% rename from weboob/applications/bands/bands.py rename to woob/applications/bands/bands.py index f3e7f7333d5dc877d7b9c30267fb604a412d06e4..b91e12e1b808cc8d1678db78294b268e360caffb 100644 --- a/weboob/applications/bands/bands.py +++ b/woob/applications/bands/bands.py @@ -18,10 +18,10 @@ # along with woob. If not, see . -from weboob.capabilities.base import empty -from weboob.capabilities.bands import CapBands -from weboob.tools.application.repl import ReplApplication, defaultcount -from weboob.tools.application.formatters.iformatter import PrettyFormatter +from woob.capabilities.base import empty +from woob.capabilities.bands import CapBands +from woob.tools.application.repl import ReplApplication, defaultcount +from woob.tools.application.formatters.iformatter import PrettyFormatter __all__ = ['Appbands', 'BandInfoFormatter', 'BandListFormatter', 'FavoritesFormatter'] diff --git a/weboob/applications/bank/__init__.py b/woob/applications/bank/__init__.py similarity index 100% rename from weboob/applications/bank/__init__.py rename to woob/applications/bank/__init__.py diff --git a/weboob/applications/bank/bank.py b/woob/applications/bank/bank.py similarity index 98% rename from weboob/applications/bank/bank.py rename to woob/applications/bank/bank.py index 62d9e02fae3cc4f3eb7795480fcf617f31b64236..909ac7b70f3b47a3e4ad6c63056efb8ab7528725 100644 --- a/weboob/applications/bank/bank.py +++ b/woob/applications/bank/bank.py @@ -26,30 +26,30 @@ from dateutil.parser import parse as parse_date from decimal import Decimal, InvalidOperation -from weboob.browser.browsers import APIBrowser -from weboob.browser.profiles import Woob -from weboob.exceptions import ( +from woob.browser.browsers import APIBrowser +from woob.browser.profiles import Woob +from woob.exceptions import ( BrowserHTTPError, CaptchaQuestion, DecoupledValidation, AppValidationCancelled, AppValidationExpired, ) -from weboob.core.bcall import CallErrors -from weboob.capabilities.base import empty, find_object -from weboob.capabilities.bank import ( +from woob.core.bcall import CallErrors +from woob.capabilities.base import empty, find_object +from woob.capabilities.bank import ( Account, Transaction, Transfer, TransferStep, Recipient, AddRecipientStep, CapBank, CapTransfer, TransferInvalidLabel, TransferInvalidAmount, TransferInvalidDate, TransferInvalidEmitter, TransferInvalidRecipient, ) -from weboob.capabilities.wealth import CapBankWealth -from weboob.capabilities.captcha import exception_to_job -from weboob.capabilities.profile import CapProfile -from weboob.tools.application.repl import ReplApplication, defaultcount -from weboob.tools.application.captcha import CaptchaMixin -from weboob.tools.application.formatters.iformatter import IFormatter, PrettyFormatter -from weboob.tools.compat import getproxies -from weboob.tools.log import getLogger -from weboob.tools.misc import to_unicode +from woob.capabilities.wealth import CapBankWealth +from woob.capabilities.captcha import exception_to_job +from woob.capabilities.profile import CapProfile +from woob.tools.application.repl import ReplApplication, defaultcount +from woob.tools.application.captcha import CaptchaMixin +from woob.tools.application.formatters.iformatter import IFormatter, PrettyFormatter +from woob.tools.compat import getproxies +from woob.tools.log import getLogger +from woob.tools.misc import to_unicode __all__ = ['Appbank'] diff --git a/weboob/applications/bill/__init__.py b/woob/applications/bill/__init__.py similarity index 100% rename from weboob/applications/bill/__init__.py rename to woob/applications/bill/__init__.py diff --git a/weboob/applications/bill/bill.py b/woob/applications/bill/bill.py similarity index 95% rename from weboob/applications/bill/bill.py rename to woob/applications/bill/bill.py index 7450ad9d79109d98b6b86b03f612167d22708b75..cec6b95ed85bc6e810861edcb66057d020206920 100644 --- a/weboob/applications/bill/bill.py +++ b/woob/applications/bill/bill.py @@ -22,15 +22,15 @@ from decimal import Decimal import sys -from weboob.capabilities.bill import CapDocument, Detail, Subscription -from weboob.capabilities.profile import CapProfile -from weboob.tools.application.repl import ReplApplication, defaultcount -from weboob.tools.application.formatters.iformatter import PrettyFormatter -from weboob.tools.application.base import MoreResultsAvailable -from weboob.tools.application.captcha import CaptchaMixin -from weboob.core import CallErrors -from weboob.exceptions import CaptchaQuestion -from weboob.capabilities.captcha import exception_to_job +from woob.capabilities.bill import CapDocument, Detail, Subscription +from woob.capabilities.profile import CapProfile +from woob.tools.application.repl import ReplApplication, defaultcount +from woob.tools.application.formatters.iformatter import PrettyFormatter +from woob.tools.application.base import MoreResultsAvailable +from woob.tools.application.captcha import CaptchaMixin +from woob.core import CallErrors +from woob.exceptions import CaptchaQuestion +from woob.capabilities.captcha import exception_to_job __all__ = ['AppBill'] diff --git a/weboob/applications/books/__init__.py b/woob/applications/books/__init__.py similarity index 100% rename from weboob/applications/books/__init__.py rename to woob/applications/books/__init__.py diff --git a/weboob/applications/books/books.py b/woob/applications/books/books.py similarity index 93% rename from weboob/applications/books/books.py rename to woob/applications/books/books.py index 8ac9f9f95811656dcb68976538e3fb39a6699525..cac919098cb6943a85f32ac4e3631a3c74d754c7 100644 --- a/weboob/applications/books/books.py +++ b/woob/applications/books/books.py @@ -19,9 +19,9 @@ from __future__ import print_function -from weboob.capabilities.library import CapBook, Book -from weboob.tools.application.repl import ReplApplication -from weboob.tools.application.formatters.iformatter import PrettyFormatter +from woob.capabilities.library import CapBook, Book +from woob.tools.application.repl import ReplApplication +from woob.tools.application.formatters.iformatter import PrettyFormatter __all__ = ['AppBooks'] diff --git a/weboob/applications/bugtracker/__init__.py b/woob/applications/bugtracker/__init__.py similarity index 100% rename from weboob/applications/bugtracker/__init__.py rename to woob/applications/bugtracker/__init__.py diff --git a/weboob/applications/bugtracker/bugtracker.py b/woob/applications/bugtracker/bugtracker.py similarity index 97% rename from weboob/applications/bugtracker/bugtracker.py rename to woob/applications/bugtracker/bugtracker.py index a1870f2dd985ad09ccb8d8ea27e140c82b114fd3..afbc45b2b1a4f0ffca6cc7e7260fbf234b6d2b75 100644 --- a/weboob/applications/bugtracker/bugtracker.py +++ b/woob/applications/bugtracker/bugtracker.py @@ -28,13 +28,13 @@ import re import unicodedata -from weboob.capabilities.base import empty, BaseObject -from weboob.capabilities.bugtracker import CapBugTracker, Query, Update, Project, Issue, IssueError -from weboob.tools.application.repl import ReplApplication, defaultcount -from weboob.tools.application.formatters.iformatter import IFormatter, PrettyFormatter -from weboob.tools.compat import basestring, unicode -from weboob.tools.html import html2text -from weboob.tools.date import parse_french_date +from woob.capabilities.base import empty, BaseObject +from woob.capabilities.bugtracker import CapBugTracker, Query, Update, Project, Issue, IssueError +from woob.tools.application.repl import ReplApplication, defaultcount +from woob.tools.application.formatters.iformatter import IFormatter, PrettyFormatter +from woob.tools.compat import basestring, unicode +from woob.tools.html import html2text +from woob.tools.date import parse_french_date __all__ = ['AppBugTracker'] diff --git a/weboob/applications/calendar/__init__.py b/woob/applications/calendar/__init__.py similarity index 100% rename from weboob/applications/calendar/__init__.py rename to woob/applications/calendar/__init__.py diff --git a/weboob/applications/calendar/calendar.py b/woob/applications/calendar/calendar.py similarity index 97% rename from weboob/applications/calendar/calendar.py rename to woob/applications/calendar/calendar.py index b0cdc773cc0260ab36f998d9b3a93737a95eb756..bb760733d861d6c523371b4af91b59adf34dcebf 100644 --- a/weboob/applications/calendar/calendar.py +++ b/woob/applications/calendar/calendar.py @@ -22,12 +22,12 @@ from datetime import time, datetime from dateutil import tz -from weboob.tools.date import parse_date -from weboob.tools.application.formatters.iformatter import IFormatter, PrettyFormatter -from weboob.capabilities.base import empty -from weboob.capabilities.calendar import CapCalendarEvent, Query, CATEGORIES, BaseCalendarEvent, TICKET, STATUS -from weboob.tools.application.repl import ReplApplication, defaultcount -from weboob.tools.config.yamlconfig import YamlConfig +from woob.tools.date import parse_date +from woob.tools.application.formatters.iformatter import IFormatter, PrettyFormatter +from woob.capabilities.base import empty +from woob.capabilities.calendar import CapCalendarEvent, Query, CATEGORIES, BaseCalendarEvent, TICKET, STATUS +from woob.tools.application.repl import ReplApplication, defaultcount +from woob.tools.config.yamlconfig import YamlConfig __all__ = ['AppCalendar'] diff --git a/weboob/applications/cinema/__init__.py b/woob/applications/cinema/__init__.py similarity index 100% rename from weboob/applications/cinema/__init__.py rename to woob/applications/cinema/__init__.py diff --git a/weboob/applications/cinema/cinema.py b/woob/applications/cinema/cinema.py similarity index 97% rename from weboob/applications/cinema/cinema.py rename to woob/applications/cinema/cinema.py index 789444dd1925bf54d9c3a79db00d1e32933dfd1c..31a55f3d871ed81b455d11bf548961e1a533710a 100644 --- a/weboob/applications/cinema/cinema.py +++ b/woob/applications/cinema/cinema.py @@ -21,15 +21,15 @@ from datetime import datetime -from weboob.applications.torrent.torrent import TorrentInfoFormatter, TorrentListFormatter -from weboob.applications.subtitles.subtitles import SubtitleInfoFormatter, SubtitleListFormatter -from weboob.capabilities.torrent import CapTorrent, MagnetOnly -from weboob.capabilities.cinema import CapCinema -from weboob.capabilities.subtitle import CapSubtitle -from weboob.capabilities.base import empty, NotAvailable -from weboob.tools.application.repl import ReplApplication, defaultcount -from weboob.tools.application.formatters.iformatter import IFormatter, PrettyFormatter -from weboob.core import CallErrors +from woob.applications.torrent.torrent import TorrentInfoFormatter, TorrentListFormatter +from woob.applications.subtitles.subtitles import SubtitleInfoFormatter, SubtitleListFormatter +from woob.capabilities.torrent import CapTorrent, MagnetOnly +from woob.capabilities.cinema import CapCinema +from woob.capabilities.subtitle import CapSubtitle +from woob.capabilities.base import empty, NotAvailable +from woob.tools.application.repl import ReplApplication, defaultcount +from woob.tools.application.formatters.iformatter import IFormatter, PrettyFormatter +from woob.core import CallErrors __all__ = ['AppCinema'] diff --git a/weboob/applications/cli/__init__.py b/woob/applications/cli/__init__.py similarity index 100% rename from weboob/applications/cli/__init__.py rename to woob/applications/cli/__init__.py diff --git a/weboob/applications/cli/cli.py b/woob/applications/cli/cli.py similarity index 96% rename from weboob/applications/cli/cli.py rename to woob/applications/cli/cli.py index 451b0aafb8fb04d2904e44f26c6359be6731ca53..c41d415357a160d976ea900b033d4731bb98d1f1 100644 --- a/weboob/applications/cli/cli.py +++ b/woob/applications/cli/cli.py @@ -19,7 +19,7 @@ from __future__ import print_function -from weboob.tools.application.repl import ReplApplication +from woob.tools.application.repl import ReplApplication __all__ = ['AppCli'] diff --git a/weboob/applications/config/__init__.py b/woob/applications/config/__init__.py similarity index 100% rename from weboob/applications/config/__init__.py rename to woob/applications/config/__init__.py diff --git a/weboob/applications/config/config.py b/woob/applications/config/config.py similarity index 97% rename from weboob/applications/config/config.py rename to woob/applications/config/config.py index bd6398bd6c32357591a7555af2e2f0f55ebcb18d..756108b33829d5f482aef916244be49b63032750 100644 --- a/weboob/applications/config/config.py +++ b/woob/applications/config/config.py @@ -22,11 +22,11 @@ import os from collections import OrderedDict -from weboob.capabilities.account import CapAccount -from weboob.exceptions import ModuleLoadError -from weboob.tools.application.repl import ReplApplication -from weboob.tools.application.console import ConsoleProgress -from weboob.tools.application.formatters.iformatter import IFormatter +from woob.capabilities.account import CapAccount +from woob.exceptions import ModuleLoadError +from woob.tools.application.repl import ReplApplication +from woob.tools.application.console import ConsoleProgress +from woob.tools.application.formatters.iformatter import IFormatter __all__ = ['AppConfig'] diff --git a/weboob/applications/contentedit/__init__.py b/woob/applications/contentedit/__init__.py similarity index 100% rename from weboob/applications/contentedit/__init__.py rename to woob/applications/contentedit/__init__.py diff --git a/weboob/applications/contentedit/contentedit.py b/woob/applications/contentedit/contentedit.py similarity index 97% rename from weboob/applications/contentedit/contentedit.py rename to woob/applications/contentedit/contentedit.py index 4a38016e7557dfa3fe479ce06e502035bb5c8acb..f4ef685d120def2ee9f32199ef0fb74bee2a6f1d 100644 --- a/weboob/applications/contentedit/contentedit.py +++ b/woob/applications/contentedit/contentedit.py @@ -25,9 +25,9 @@ import subprocess from shutil import which -from weboob.core.bcall import CallErrors -from weboob.capabilities.content import CapContent, Revision, Content -from weboob.tools.application.repl import ReplApplication, defaultcount +from woob.core.bcall import CallErrors +from woob.capabilities.content import CapContent, Revision, Content +from woob.tools.application.repl import ReplApplication, defaultcount __all__ = ['AppContentEdit'] diff --git a/weboob/applications/dating/__init__.py b/woob/applications/dating/__init__.py similarity index 100% rename from weboob/applications/dating/__init__.py rename to woob/applications/dating/__init__.py diff --git a/weboob/applications/dating/dating.py b/woob/applications/dating/dating.py similarity index 97% rename from weboob/applications/dating/dating.py rename to woob/applications/dating/dating.py index 5c6eccd631c72a4f761183572b0bf4f6429d8e8f..d8a43ed1554abcb08d20a6fc78a76075e32a403c 100644 --- a/weboob/applications/dating/dating.py +++ b/woob/applications/dating/dating.py @@ -21,11 +21,11 @@ from copy import copy -from weboob.core import CallErrors -from weboob.tools.application.repl import ReplApplication -from weboob.applications.msg import AppMsg -from weboob.capabilities.dating import CapDating, OptimizationNotFound -from weboob.tools.application.formatters.iformatter import PrettyFormatter +from woob.core import CallErrors +from woob.tools.application.repl import ReplApplication +from woob.applications.msg import AppMsg +from woob.capabilities.dating import CapDating, OptimizationNotFound +from woob.tools.application.formatters.iformatter import PrettyFormatter __all__ = ['AppDating'] diff --git a/weboob/applications/debug/__init__.py b/woob/applications/debug/__init__.py similarity index 100% rename from weboob/applications/debug/__init__.py rename to woob/applications/debug/__init__.py diff --git a/weboob/applications/debug/debug.py b/woob/applications/debug/debug.py similarity index 96% rename from weboob/applications/debug/debug.py rename to woob/applications/debug/debug.py index 5633250a2ff65df2e1823641ca8e63960618225f..bc973d591dfe3c8894a458f11883be2647df2522 100644 --- a/weboob/applications/debug/debug.py +++ b/woob/applications/debug/debug.py @@ -21,8 +21,8 @@ from optparse import OptionGroup -from weboob.tools.application.base import Application -from weboob.browser.elements import generate_table_element +from woob.tools.application.base import Application +from woob.browser.elements import generate_table_element class AppDebug(Application): diff --git a/weboob/applications/gallery/__init__.py b/woob/applications/gallery/__init__.py similarity index 100% rename from weboob/applications/gallery/__init__.py rename to woob/applications/gallery/__init__.py diff --git a/weboob/applications/gallery/gallery.py b/woob/applications/gallery/gallery.py similarity index 94% rename from weboob/applications/gallery/gallery.py rename to woob/applications/gallery/gallery.py index ac4163bc9d2f646bcadf8b5a79be5d2c2a853bde..b8eca221507486b1c9b63feb23e43d676d9c400a 100644 --- a/weboob/applications/gallery/gallery.py +++ b/woob/applications/gallery/gallery.py @@ -22,10 +22,10 @@ import os from re import search, sub -from weboob.tools.application.repl import ReplApplication, defaultcount -from weboob.capabilities.base import empty -from weboob.capabilities.gallery import CapGallery, BaseGallery, BaseImage -from weboob.tools.application.formatters.iformatter import PrettyFormatter +from woob.tools.application.repl import ReplApplication, defaultcount +from woob.capabilities.base import empty +from woob.capabilities.gallery import CapGallery, BaseGallery, BaseImage +from woob.tools.application.formatters.iformatter import PrettyFormatter __all__ = ['AppGallery'] diff --git a/weboob/applications/gauge/__init__.py b/woob/applications/gauge/__init__.py similarity index 100% rename from weboob/applications/gauge/__init__.py rename to woob/applications/gauge/__init__.py diff --git a/weboob/applications/gauge/gauge.py b/woob/applications/gauge/gauge.py similarity index 96% rename from weboob/applications/gauge/gauge.py rename to woob/applications/gauge/gauge.py index 0e02bb505c16dc9c277858004131c2ffe46038a4..884509daf2c3a8fde09eab38c696d519d544ecdd 100644 --- a/weboob/applications/gauge/gauge.py +++ b/woob/applications/gauge/gauge.py @@ -19,11 +19,11 @@ from __future__ import print_function -from weboob.capabilities.base import empty -from weboob.capabilities.gauge import CapGauge, SensorNotFound -from weboob.tools.application.repl import ReplApplication -from weboob.tools.application.formatters.iformatter import IFormatter -from weboob.tools.compat import unicode +from woob.capabilities.base import empty +from woob.capabilities.gauge import CapGauge, SensorNotFound +from woob.tools.application.repl import ReplApplication +from woob.tools.application.formatters.iformatter import IFormatter +from woob.tools.compat import unicode __all__ = ['AppGauge'] diff --git a/weboob/applications/geolocip/__init__.py b/woob/applications/geolocip/__init__.py similarity index 100% rename from weboob/applications/geolocip/__init__.py rename to woob/applications/geolocip/__init__.py diff --git a/weboob/applications/geolocip/geolocip.py b/woob/applications/geolocip/geolocip.py similarity index 93% rename from weboob/applications/geolocip/geolocip.py rename to woob/applications/geolocip/geolocip.py index bffedb80808d4b981af92645b29cd3541b4d1883..0dbf21a20ee70b4339abe5178d3351e12636c38a 100644 --- a/weboob/applications/geolocip/geolocip.py +++ b/woob/applications/geolocip/geolocip.py @@ -19,8 +19,8 @@ from __future__ import print_function -from weboob.capabilities.geolocip import CapGeolocIp -from weboob.tools.application.repl import ReplApplication +from woob.capabilities.geolocip import CapGeolocIp +from woob.tools.application.repl import ReplApplication __all__ = ['AppGeolocIP'] diff --git a/weboob/applications/housing/__init__.py b/woob/applications/housing/__init__.py similarity index 100% rename from weboob/applications/housing/__init__.py rename to woob/applications/housing/__init__.py diff --git a/weboob/applications/housing/housing.py b/woob/applications/housing/housing.py similarity index 96% rename from weboob/applications/housing/housing.py rename to woob/applications/housing/housing.py index 2c08cf82f6741a64fa721d221fa80bd3e835c401..ba71ed843aaf7e9f3ad031a8bcc59389b53de08c 100644 --- a/weboob/applications/housing/housing.py +++ b/woob/applications/housing/housing.py @@ -19,12 +19,12 @@ from __future__ import print_function -from weboob.capabilities.housing import (CapHousing, Query, POSTS_TYPES, +from woob.capabilities.housing import (CapHousing, Query, POSTS_TYPES, ADVERT_TYPES, HOUSE_TYPES) -from weboob.capabilities.base import empty -from weboob.tools.application.repl import ReplApplication, defaultcount -from weboob.tools.application.formatters.iformatter import IFormatter, PrettyFormatter -from weboob.tools.config.yamlconfig import YamlConfig +from woob.capabilities.base import empty +from woob.tools.application.repl import ReplApplication, defaultcount +from woob.tools.application.formatters.iformatter import IFormatter, PrettyFormatter +from woob.tools.config.yamlconfig import YamlConfig __all__ = ['AppHousing'] diff --git a/weboob/applications/job/__init__.py b/woob/applications/job/__init__.py similarity index 100% rename from weboob/applications/job/__init__.py rename to woob/applications/job/__init__.py diff --git a/weboob/applications/job/job.py b/woob/applications/job/job.py similarity index 95% rename from weboob/applications/job/job.py rename to woob/applications/job/job.py index d6c3e54d51aa88f2e70f9d25714e9b0acbc344fc..68a33fbc85965d4c46089015dc0f8f5b4773c269 100644 --- a/weboob/applications/job/job.py +++ b/woob/applications/job/job.py @@ -19,9 +19,9 @@ from __future__ import print_function -from weboob.capabilities.job import CapJob -from weboob.tools.application.repl import ReplApplication, defaultcount -from weboob.tools.application.formatters.iformatter import IFormatter, PrettyFormatter +from woob.capabilities.job import CapJob +from woob.tools.application.repl import ReplApplication, defaultcount +from woob.tools.application.formatters.iformatter import IFormatter, PrettyFormatter __all__ = ['AppJob'] diff --git a/weboob/applications/lyrics/__init__.py b/woob/applications/lyrics/__init__.py similarity index 100% rename from weboob/applications/lyrics/__init__.py rename to woob/applications/lyrics/__init__.py diff --git a/weboob/applications/lyrics/lyrics.py b/woob/applications/lyrics/lyrics.py similarity index 93% rename from weboob/applications/lyrics/lyrics.py rename to woob/applications/lyrics/lyrics.py index aaefbebb540e8c178c4b486a244781237b431afa..64623b30caa121d0ec337b3664f4d64071905131 100644 --- a/weboob/applications/lyrics/lyrics.py +++ b/woob/applications/lyrics/lyrics.py @@ -19,10 +19,10 @@ from __future__ import print_function -from weboob.capabilities.lyrics import CapLyrics -from weboob.capabilities.base import empty -from weboob.tools.application.repl import ReplApplication, defaultcount -from weboob.tools.application.formatters.iformatter import IFormatter, PrettyFormatter +from woob.capabilities.lyrics import CapLyrics +from woob.capabilities.base import empty +from woob.tools.application.repl import ReplApplication, defaultcount +from woob.tools.application.formatters.iformatter import IFormatter, PrettyFormatter __all__ = ['AppLyrics', 'LyricsGetFormatter', 'LyricsListFormatter'] diff --git a/weboob/applications/main/__init__.py b/woob/applications/main/__init__.py similarity index 100% rename from weboob/applications/main/__init__.py rename to woob/applications/main/__init__.py diff --git a/weboob/applications/main/main.py b/woob/applications/main/main.py similarity index 100% rename from weboob/applications/main/main.py rename to woob/applications/main/main.py diff --git a/weboob/applications/money/__init__.py b/woob/applications/money/__init__.py similarity index 100% rename from weboob/applications/money/__init__.py rename to woob/applications/money/__init__.py diff --git a/weboob/applications/money/money.py b/woob/applications/money/money.py similarity index 99% rename from weboob/applications/money/money.py rename to woob/applications/money/money.py index 1f6bdfa35160fff8f07121d3da3ead419d390c7c..2ded08da3a5ae4dfa3dd87059f8884f35a9a13c5 100644 --- a/weboob/applications/money/money.py +++ b/woob/applications/money/money.py @@ -41,11 +41,11 @@ import shutil from colorama import init, Fore, Style -from weboob.tools.compat import unicode -from weboob.capabilities.bank import AccountType -from weboob.applications.bank import Appbank -from weboob.applications.bank.bank import OfxFormatter -from weboob.tools.application.formatters.simple import SimpleFormatter +from woob.tools.compat import unicode +from woob.capabilities.bank import AccountType +from woob.applications.bank import Appbank +from woob.applications.bank.bank import OfxFormatter +from woob.tools.application.formatters.simple import SimpleFormatter __all__ = ['AppMoney'] diff --git a/weboob/applications/msg/__init__.py b/woob/applications/msg/__init__.py similarity index 100% rename from weboob/applications/msg/__init__.py rename to woob/applications/msg/__init__.py diff --git a/weboob/applications/msg/msg.py b/woob/applications/msg/msg.py similarity index 97% rename from weboob/applications/msg/msg.py rename to woob/applications/msg/msg.py index e23c6d6afa6080d7c9eb4df7a8c29510069c4ebd..5db256037a0bfd203df9643269935651e3bdce59 100644 --- a/weboob/applications/msg/msg.py +++ b/woob/applications/msg/msg.py @@ -26,14 +26,14 @@ from tempfile import NamedTemporaryFile from lxml import etree -from weboob.core import CallErrors -from weboob.capabilities.base import empty -from weboob.capabilities.messages import CapMessages, Message, Thread -from weboob.capabilities.account import CapAccount -from weboob.capabilities.contact import CapContact -from weboob.tools.application.repl import ReplApplication, defaultcount -from weboob.tools.application.formatters.iformatter import IFormatter -from weboob.tools.html import html2text +from woob.core import CallErrors +from woob.capabilities.base import empty +from woob.capabilities.messages import CapMessages, Message, Thread +from woob.capabilities.account import CapAccount +from woob.capabilities.contact import CapContact +from woob.tools.application.repl import ReplApplication, defaultcount +from woob.tools.application.formatters.iformatter import IFormatter +from woob.tools.html import html2text __all__ = ['AppMsg'] diff --git a/weboob/applications/parcel/__init__.py b/woob/applications/parcel/__init__.py similarity index 100% rename from weboob/applications/parcel/__init__.py rename to woob/applications/parcel/__init__.py diff --git a/weboob/applications/parcel/parcel.py b/woob/applications/parcel/parcel.py similarity index 96% rename from weboob/applications/parcel/parcel.py rename to woob/applications/parcel/parcel.py index 0234221e89331d40ce111663205f84ec0a0e0dec..e2c63839b9abb488d811e047eab3b4d4357660e4 100644 --- a/weboob/applications/parcel/parcel.py +++ b/woob/applications/parcel/parcel.py @@ -19,11 +19,11 @@ from __future__ import print_function -from weboob.capabilities.base import empty -from weboob.capabilities.parcel import CapParcel, Parcel, ParcelNotFound -from weboob.core import CallErrors -from weboob.tools.application.repl import ReplApplication -from weboob.tools.application.formatters.iformatter import IFormatter +from woob.capabilities.base import empty +from woob.capabilities.parcel import CapParcel, Parcel, ParcelNotFound +from woob.core import CallErrors +from woob.tools.application.repl import ReplApplication +from woob.tools.application.formatters.iformatter import IFormatter __all__ = ['AppParcel'] diff --git a/weboob/applications/paste/__init__.py b/woob/applications/paste/__init__.py similarity index 100% rename from weboob/applications/paste/__init__.py rename to woob/applications/paste/__init__.py diff --git a/weboob/applications/paste/paste.py b/woob/applications/paste/paste.py similarity index 98% rename from weboob/applications/paste/paste.py rename to woob/applications/paste/paste.py index 950bb5a20bf9f306e327cad7beba3389b12937e3..b5070fcb758583a672f02d1d7355b93b60d099ac 100644 --- a/weboob/applications/paste/paste.py +++ b/woob/applications/paste/paste.py @@ -26,8 +26,8 @@ from random import choice import sys -from weboob.capabilities.paste import CapPaste, PasteNotFound -from weboob.tools.application.repl import ReplApplication +from woob.capabilities.paste import CapPaste, PasteNotFound +from woob.tools.application.repl import ReplApplication __all__ = ['AppPaste'] diff --git a/weboob/applications/pricecompare/__init__.py b/woob/applications/pricecompare/__init__.py similarity index 100% rename from weboob/applications/pricecompare/__init__.py rename to woob/applications/pricecompare/__init__.py diff --git a/weboob/applications/pricecompare/pricecompare.py b/woob/applications/pricecompare/pricecompare.py similarity index 93% rename from weboob/applications/pricecompare/pricecompare.py rename to woob/applications/pricecompare/pricecompare.py index 334bca642361f4e16c5970de8e2555b656cbd95e..41796d89641e3b97b8dfcb1d61c1f4babb84e5db 100644 --- a/weboob/applications/pricecompare/pricecompare.py +++ b/woob/applications/pricecompare/pricecompare.py @@ -19,12 +19,12 @@ from __future__ import print_function -from weboob.capabilities.pricecomparison import CapPriceComparison -from weboob.tools.html import html2text -from weboob.tools.application.repl import ReplApplication, defaultcount -from weboob.tools.application.formatters.iformatter import IFormatter, PrettyFormatter -from weboob.tools.application.base import MoreResultsAvailable -from weboob.tools.application.console import ConsoleApplication +from woob.capabilities.pricecomparison import CapPriceComparison +from woob.tools.html import html2text +from woob.tools.application.repl import ReplApplication, defaultcount +from woob.tools.application.formatters.iformatter import IFormatter, PrettyFormatter +from woob.tools.application.base import MoreResultsAvailable +from woob.tools.application.console import ConsoleApplication __all__ = ['AppPriceCompare'] diff --git a/weboob/applications/radio/__init__.py b/woob/applications/radio/__init__.py similarity index 100% rename from weboob/applications/radio/__init__.py rename to woob/applications/radio/__init__.py diff --git a/weboob/applications/radio/radio.py b/woob/applications/radio/radio.py similarity index 97% rename from weboob/applications/radio/radio.py rename to woob/applications/radio/radio.py index 81112914c1d1b63e793a4495c8c46420a9df6774..e9ad6a3750028c8f27bf7bfa59021075b7a2fef9 100644 --- a/weboob/applications/radio/radio.py +++ b/woob/applications/radio/radio.py @@ -26,12 +26,12 @@ import requests -from weboob.capabilities.radio import CapRadio, Radio -from weboob.capabilities.audio import CapAudio, BaseAudio, Playlist, Album -from weboob.capabilities.base import empty -from weboob.tools.application.repl import ReplApplication, defaultcount -from weboob.tools.application.media_player import InvalidMediaPlayer, MediaPlayer, MediaPlayerNotFound -from weboob.tools.application.formatters.iformatter import PrettyFormatter +from woob.capabilities.radio import CapRadio, Radio +from woob.capabilities.audio import CapAudio, BaseAudio, Playlist, Album +from woob.capabilities.base import empty +from woob.tools.application.repl import ReplApplication, defaultcount +from woob.tools.application.media_player import InvalidMediaPlayer, MediaPlayer, MediaPlayerNotFound +from woob.tools.application.formatters.iformatter import PrettyFormatter __all__ = ['AppRadio'] diff --git a/weboob/applications/recipes/__init__.py b/woob/applications/recipes/__init__.py similarity index 100% rename from weboob/applications/recipes/__init__.py rename to woob/applications/recipes/__init__.py diff --git a/weboob/applications/recipes/recipes.py b/woob/applications/recipes/recipes.py similarity index 94% rename from weboob/applications/recipes/recipes.py rename to woob/applications/recipes/recipes.py index b063979270700ab7291b8c9534e69fdf6b02dc95..47533480728e553ed51f7d94be73ecaa1ca88417 100644 --- a/weboob/applications/recipes/recipes.py +++ b/woob/applications/recipes/recipes.py @@ -21,11 +21,11 @@ import codecs -from weboob.capabilities.recipe import CapRecipe -from weboob.capabilities.base import empty -from weboob.tools.application.repl import ReplApplication, defaultcount -from weboob.tools.application.formatters.iformatter import IFormatter, PrettyFormatter -from weboob.tools.capabilities.recipe import recipe_to_krecipes_xml +from woob.capabilities.recipe import CapRecipe +from woob.capabilities.base import empty +from woob.tools.application.repl import ReplApplication, defaultcount +from woob.tools.application.formatters.iformatter import IFormatter, PrettyFormatter +from woob.tools.capabilities.recipe import recipe_to_krecipes_xml __all__ = ['AppRecipes'] diff --git a/weboob/applications/repos/__init__.py b/woob/applications/repos/__init__.py similarity index 100% rename from weboob/applications/repos/__init__.py rename to woob/applications/repos/__init__.py diff --git a/weboob/applications/repos/repos.py b/woob/applications/repos/repos.py similarity index 98% rename from weboob/applications/repos/repos.py rename to woob/applications/repos/repos.py index dc4298db0596470f67383e84c183e7a917ff94f1..27e255a7b4f5b5ee191e30b579523b82aaee3215 100644 --- a/weboob/applications/repos/repos.py +++ b/woob/applications/repos/repos.py @@ -28,10 +28,10 @@ from copy import copy from contextlib import closing -from weboob.core.repositories import Repository +from woob.core.repositories import Repository -from weboob.tools.application.repl import ReplApplication -from weboob.tools.misc import find_exe +from woob.tools.application.repl import ReplApplication +from woob.tools.misc import find_exe __all__ = ['AppWoobRepos'] diff --git a/weboob/applications/rpg/__init__.py b/woob/applications/rpg/__init__.py similarity index 100% rename from weboob/applications/rpg/__init__.py rename to woob/applications/rpg/__init__.py diff --git a/weboob/applications/rpg/rpg.py b/woob/applications/rpg/rpg.py similarity index 95% rename from weboob/applications/rpg/rpg.py rename to woob/applications/rpg/rpg.py index f121f03ee3bcffe8d0e6f6c0767ebe0f3a5d3610..72ef7315e4e3c46c1eef535b97a2798e10c671d3 100644 --- a/weboob/applications/rpg/rpg.py +++ b/woob/applications/rpg/rpg.py @@ -18,8 +18,8 @@ # along with woob. If not, see . -from weboob.capabilities.rpg import CapRPG, Character, Skill, CharacterClass, CollectableItem -from weboob.tools.application.repl import ReplApplication, defaultcount +from woob.capabilities.rpg import CapRPG, Character, Skill, CharacterClass, CollectableItem +from woob.tools.application.repl import ReplApplication, defaultcount class AppRPG(ReplApplication): diff --git a/weboob/applications/shop/__init__.py b/woob/applications/shop/__init__.py similarity index 100% rename from weboob/applications/shop/__init__.py rename to woob/applications/shop/__init__.py diff --git a/weboob/applications/shop/shop.py b/woob/applications/shop/shop.py similarity index 96% rename from weboob/applications/shop/shop.py rename to woob/applications/shop/shop.py index 90f8d16ebba2f95f057fa26f22f0a2248c857628..910c146d5cf49e80e9fea9b26be392229382f966 100644 --- a/weboob/applications/shop/shop.py +++ b/woob/applications/shop/shop.py @@ -21,10 +21,10 @@ from decimal import Decimal -from weboob.capabilities.base import empty -from weboob.capabilities.shop import CapShop, Order, Item -from weboob.tools.application.repl import ReplApplication, defaultcount -from weboob.tools.application.formatters.iformatter import IFormatter +from woob.capabilities.base import empty +from woob.capabilities.shop import CapShop, Order, Item +from woob.tools.application.repl import ReplApplication, defaultcount +from woob.tools.application.formatters.iformatter import IFormatter __all__ = ['AppShop'] diff --git a/weboob/applications/smtp/__init__.py b/woob/applications/smtp/__init__.py similarity index 100% rename from weboob/applications/smtp/__init__.py rename to woob/applications/smtp/__init__.py diff --git a/weboob/applications/smtp/smtp.py b/woob/applications/smtp/smtp.py similarity index 97% rename from weboob/applications/smtp/smtp.py rename to woob/applications/smtp/smtp.py index 2ce8c7003447bbd5c6d2da554bfa5c85cba43027..8b233530fa63afdae7f0198ddfd2feaea59dce29 100644 --- a/weboob/applications/smtp/smtp.py +++ b/woob/applications/smtp/smtp.py @@ -32,14 +32,14 @@ import subprocess import socket -from weboob.core import Woob, CallErrors -from weboob.core.scheduler import Scheduler -from weboob.capabilities.messages import CapMessages, CapMessagesPost, Thread, Message -from weboob.tools.application.repl import ReplApplication -from weboob.tools.compat import unicode -from weboob.tools.date import utc2local -from weboob.tools.html import html2text -from weboob.tools.misc import get_backtrace, to_unicode +from woob.core import Woob, CallErrors +from woob.core.scheduler import Scheduler +from woob.capabilities.messages import CapMessages, CapMessagesPost, Thread, Message +from woob.tools.application.repl import ReplApplication +from woob.tools.compat import unicode +from woob.tools.date import utc2local +from woob.tools.html import html2text +from woob.tools.misc import get_backtrace, to_unicode __all__ = ['AppSmtp'] diff --git a/weboob/applications/subtitles/__init__.py b/woob/applications/subtitles/__init__.py similarity index 100% rename from weboob/applications/subtitles/__init__.py rename to woob/applications/subtitles/__init__.py diff --git a/weboob/applications/subtitles/subtitles.py b/woob/applications/subtitles/subtitles.py similarity index 96% rename from weboob/applications/subtitles/subtitles.py rename to woob/applications/subtitles/subtitles.py index f734d7cc4a796f50162ee8e44932dc657d7535ea..14195417d8f691320655f720ef310da2b979e0d0 100644 --- a/weboob/applications/subtitles/subtitles.py +++ b/woob/applications/subtitles/subtitles.py @@ -21,10 +21,10 @@ import sys -from weboob.capabilities.subtitle import CapSubtitle -from weboob.capabilities.base import empty -from weboob.tools.application.repl import ReplApplication, defaultcount -from weboob.tools.application.formatters.iformatter import IFormatter, PrettyFormatter +from woob.capabilities.subtitle import CapSubtitle +from woob.capabilities.base import empty +from woob.tools.application.repl import ReplApplication, defaultcount +from woob.tools.application.formatters.iformatter import IFormatter, PrettyFormatter __all__ = ['AppSubtitles'] diff --git a/weboob/applications/torrent/__init__.py b/woob/applications/torrent/__init__.py similarity index 100% rename from weboob/applications/torrent/__init__.py rename to woob/applications/torrent/__init__.py diff --git a/weboob/applications/torrent/torrent.py b/woob/applications/torrent/torrent.py similarity index 95% rename from weboob/applications/torrent/torrent.py rename to woob/applications/torrent/torrent.py index 73ef8bf0c3eee0a242fb0dbca0bf5b13dae4408a..8efc06e9665754250434cff2994cab6f8cacd091 100644 --- a/weboob/applications/torrent/torrent.py +++ b/woob/applications/torrent/torrent.py @@ -19,11 +19,11 @@ from __future__ import print_function -from weboob.capabilities.torrent import CapTorrent, MagnetOnly -from weboob.tools.application.repl import ReplApplication, defaultcount -from weboob.tools.application.formatters.iformatter import IFormatter, PrettyFormatter -from weboob.core import CallErrors -from weboob.capabilities.base import NotAvailable, NotLoaded, empty +from woob.capabilities.torrent import CapTorrent, MagnetOnly +from woob.tools.application.repl import ReplApplication, defaultcount +from woob.tools.application.formatters.iformatter import IFormatter, PrettyFormatter +from woob.core import CallErrors +from woob.capabilities.base import NotAvailable, NotLoaded, empty __all__ = ['AppTorrent'] diff --git a/weboob/applications/translate/__init__.py b/woob/applications/translate/__init__.py similarity index 100% rename from weboob/applications/translate/__init__.py rename to woob/applications/translate/__init__.py diff --git a/weboob/applications/translate/translate.py b/woob/applications/translate/translate.py similarity index 95% rename from weboob/applications/translate/translate.py rename to woob/applications/translate/translate.py index a01ea6fe7a671371ed4c7b2d6fba07314104ede7..2c617b328cdc575d8aba5431ffaf0cf02214e903 100644 --- a/weboob/applications/translate/translate.py +++ b/woob/applications/translate/translate.py @@ -21,9 +21,9 @@ import re -from weboob.capabilities.translate import CapTranslate, TranslationFail, LanguageNotSupported -from weboob.tools.application.repl import ReplApplication -from weboob.tools.application.formatters.iformatter import IFormatter +from woob.capabilities.translate import CapTranslate, TranslationFail, LanguageNotSupported +from woob.tools.application.repl import ReplApplication +from woob.tools.application.formatters.iformatter import IFormatter from babel.core import Locale, UnknownLocaleError from babel.localedata import locale_identifiers diff --git a/weboob/applications/travel/__init__.py b/woob/applications/travel/__init__.py similarity index 100% rename from weboob/applications/travel/__init__.py rename to woob/applications/travel/__init__.py diff --git a/weboob/applications/travel/travel.py b/woob/applications/travel/travel.py similarity index 96% rename from weboob/applications/travel/travel.py rename to woob/applications/travel/travel.py index 6b083e79c479fb38ed37e0f9a40c4b02a076e920..cdce18be6dc803fd5ed322cb86ead67cbf998682 100644 --- a/weboob/applications/travel/travel.py +++ b/woob/applications/travel/travel.py @@ -21,10 +21,10 @@ import datetime -from weboob.capabilities.base import Currency, empty -from weboob.capabilities.travel import CapTravel, RoadmapFilters -from weboob.tools.application.repl import ReplApplication, defaultcount -from weboob.tools.application.formatters.iformatter import PrettyFormatter +from woob.capabilities.base import Currency, empty +from woob.capabilities.travel import CapTravel, RoadmapFilters +from woob.tools.application.repl import ReplApplication, defaultcount +from woob.tools.application.formatters.iformatter import PrettyFormatter __all__ = ['AppTravel'] diff --git a/weboob/applications/video/__init__.py b/woob/applications/video/__init__.py similarity index 100% rename from weboob/applications/video/__init__.py rename to woob/applications/video/__init__.py diff --git a/weboob/applications/video/image2xterm.py b/woob/applications/video/image2xterm.py similarity index 99% rename from weboob/applications/video/image2xterm.py rename to woob/applications/video/image2xterm.py index c8c7b9245263eb2644f0b0ae86bab09416fbc73f..cea9b49b57b54e934859b8d3f3b2a209a2438c8b 100644 --- a/weboob/applications/video/image2xterm.py +++ b/woob/applications/video/image2xterm.py @@ -28,7 +28,7 @@ import PIL.Image as Image import PIL.ImageColor as PILColor -from weboob.tools.compat import range +from woob.tools.compat import range """ XTerm can decode sequences and display 256 colors: diff --git a/weboob/applications/video/video.py b/woob/applications/video/video.py similarity index 96% rename from weboob/applications/video/video.py rename to woob/applications/video/video.py index 7c5dd0ce988ab5be33aeee6da5b6c570b6f5861a..b5739dbf9af464c861efd73ae62fdca933c523d1 100644 --- a/weboob/applications/video/video.py +++ b/woob/applications/video/video.py @@ -26,12 +26,12 @@ import requests -from weboob.capabilities.video import CapVideo, BaseVideo -from weboob.capabilities.base import empty -from weboob.tools.application.repl import ReplApplication, defaultcount -from weboob.tools.application.media_player import InvalidMediaPlayer, MediaPlayer, MediaPlayerNotFound -from weboob.tools.application.formatters.iformatter import PrettyFormatter -from weboob.tools.compat import urlparse +from woob.capabilities.video import CapVideo, BaseVideo +from woob.capabilities.base import empty +from woob.tools.application.repl import ReplApplication, defaultcount +from woob.tools.application.media_player import InvalidMediaPlayer, MediaPlayer, MediaPlayerNotFound +from woob.tools.application.formatters.iformatter import PrettyFormatter +from woob.tools.compat import urlparse from .image2xterm import image2xterm, get_term_size diff --git a/weboob/applications/weather/__init__.py b/woob/applications/weather/__init__.py similarity index 100% rename from weboob/applications/weather/__init__.py rename to woob/applications/weather/__init__.py diff --git a/weboob/applications/weather/weather.py b/woob/applications/weather/weather.py similarity index 94% rename from weboob/applications/weather/weather.py rename to woob/applications/weather/weather.py index a3e6c97f37c072b5ac345284bfaf52ab8426dbd7..3db75150b4a32eb0bcaef3389cbf9ef773c088cd 100644 --- a/weboob/applications/weather/weather.py +++ b/woob/applications/weather/weather.py @@ -18,10 +18,10 @@ # along with woob. If not, see . -from weboob.capabilities.base import empty -from weboob.capabilities.weather import CapWeather -from weboob.tools.application.repl import ReplApplication, defaultcount -from weboob.tools.application.formatters.iformatter import IFormatter, PrettyFormatter +from woob.capabilities.base import empty +from woob.capabilities.weather import CapWeather +from woob.tools.application.repl import ReplApplication, defaultcount +from woob.tools.application.formatters.iformatter import IFormatter, PrettyFormatter __all__ = ['AppWeather'] diff --git a/weboob/browser/__init__.py b/woob/browser/__init__.py similarity index 100% rename from weboob/browser/__init__.py rename to woob/browser/__init__.py diff --git a/weboob/browser/adapters.py b/woob/browser/adapters.py similarity index 100% rename from weboob/browser/adapters.py rename to woob/browser/adapters.py diff --git a/weboob/browser/browsers.py b/woob/browser/browsers.py similarity index 99% rename from weboob/browser/browsers.py rename to woob/browser/browsers.py index 32169c7ab92cb643b2faee87f3b887227b1961b5..f77a71e14408aab42202bca2b57399e61dba6f12 100644 --- a/weboob/browser/browsers.py +++ b/woob/browser/browsers.py @@ -48,17 +48,17 @@ except ImportError: raise ImportError('Please install python3-requests >= 2.0') -from weboob.exceptions import ( +from woob.exceptions import ( BrowserHTTPSDowngrade, ModuleInstallError, BrowserRedirect, BrowserIncorrectPassword, NeedInteractiveFor2FA, BrowserInteraction, ) -from weboob.tools.log import getLogger -from weboob.tools.compat import basestring, unicode, urlparse, urljoin, urlencode, parse_qsl -from weboob.tools.misc import to_unicode -from weboob.tools.json import json -from weboob.tools.value import Value -from weboob import __version__ +from woob.tools.log import getLogger +from woob.tools.compat import basestring, unicode, urlparse, urljoin, urlencode, parse_qsl +from woob.tools.misc import to_unicode +from woob.tools.json import json +from woob.tools.value import Value +from woob import __version__ from .adapters import HTTPAdapter from .cookies import WoobCookieJar diff --git a/weboob/browser/cache.py b/woob/browser/cache.py similarity index 100% rename from weboob/browser/cache.py rename to woob/browser/cache.py diff --git a/weboob/browser/cookies.py b/woob/browser/cookies.py similarity index 100% rename from weboob/browser/cookies.py rename to woob/browser/cookies.py diff --git a/weboob/browser/elements.py b/woob/browser/elements.py similarity index 98% rename from weboob/browser/elements.py rename to woob/browser/elements.py index 8aa318caed41a8928f0e1e11e7d2efedfcafa0cf..1e3b6d087b54eae307d5bb4bd41309d7d7d8d4ab 100644 --- a/weboob/browser/elements.py +++ b/woob/browser/elements.py @@ -28,10 +28,10 @@ import lxml.html -from weboob.tools.log import getLogger, DEBUG_FILTERS -from weboob.tools.compat import basestring, unicode, with_metaclass -from weboob.browser.pages import NextPage -from weboob.capabilities.base import FetchError +from woob.tools.log import getLogger, DEBUG_FILTERS +from woob.tools.compat import basestring, unicode, with_metaclass +from woob.browser.pages import NextPage +from woob.capabilities.base import FetchError from .filters.standard import _Filter, CleanText from .filters.html import AttributeNotFound, XPathNotFound diff --git a/weboob/browser/exceptions.py b/woob/browser/exceptions.py similarity index 98% rename from weboob/browser/exceptions.py rename to woob/browser/exceptions.py index 8b51a02478e86cae8944bd20b988c2ed5b66b62d..2de89ddb85dbb7e35f0c57bd1d01086d39904fca 100644 --- a/weboob/browser/exceptions.py +++ b/woob/browser/exceptions.py @@ -21,7 +21,7 @@ from dateutil.relativedelta import relativedelta from requests.exceptions import HTTPError -from weboob.exceptions import ( +from woob.exceptions import ( BrowserHTTPError, BrowserHTTPNotFound, BrowserUnavailable, ) diff --git a/weboob/browser/filters/__init__.py b/woob/browser/filters/__init__.py similarity index 100% rename from weboob/browser/filters/__init__.py rename to woob/browser/filters/__init__.py diff --git a/weboob/browser/filters/base.py b/woob/browser/filters/base.py similarity index 97% rename from weboob/browser/filters/base.py rename to woob/browser/filters/base.py index 0a71d7bd7ab56d589cc725b0bcf2cbd0904737fb..5d05c85c4f7e6b5b61ec86b48a7e74582f94b886 100644 --- a/weboob/browser/filters/base.py +++ b/woob/browser/filters/base.py @@ -21,9 +21,9 @@ import lxml.html -from weboob.exceptions import ParseError -from weboob.tools.compat import unicode, basestring -from weboob.tools.log import getLogger, DEBUG_FILTERS +from woob.exceptions import ParseError +from woob.tools.compat import unicode, basestring +from woob.tools.log import getLogger, DEBUG_FILTERS __all__ = ['FilterError', 'ItemNotFound', 'Filter',] diff --git a/weboob/browser/filters/html.py b/woob/browser/filters/html.py similarity index 98% rename from weboob/browser/filters/html.py rename to woob/browser/filters/html.py index 8d4e56a8e3b0e620ca0ff217836715b41f1d0b13..039a6e91d1773982648523f3dcb59795658fbcc0 100644 --- a/weboob/browser/filters/html.py +++ b/woob/browser/filters/html.py @@ -22,8 +22,8 @@ import lxml.html as html -from weboob.tools.compat import basestring, unicode, urljoin, html_unescape -from weboob.tools.html import html2text +from woob.tools.compat import basestring, unicode, urljoin, html_unescape +from woob.tools.html import html2text from .base import ( _NO_DEFAULT, Filter, FilterError, _Selector, debug, ItemNotFound, diff --git a/weboob/browser/filters/javascript.py b/woob/browser/filters/javascript.py similarity index 98% rename from weboob/browser/filters/javascript.py rename to woob/browser/filters/javascript.py index ff4d5ee26909c1349031f5db9ef1240af8f774b6..fd1e43785a41a4f0b6b0d85a6d6e93864c301fcb 100644 --- a/weboob/browser/filters/javascript.py +++ b/woob/browser/filters/javascript.py @@ -22,7 +22,7 @@ from ast import literal_eval import sys -from weboob.browser.filters.standard import Filter, Regexp, RegexpError, FormatError, ItemNotFound +from woob.browser.filters.standard import Filter, Regexp, RegexpError, FormatError, ItemNotFound __all__ = ['JSPayload', 'JSValue', 'JSVar'] diff --git a/weboob/browser/filters/json.py b/woob/browser/filters/json.py similarity index 98% rename from weboob/browser/filters/json.py rename to woob/browser/filters/json.py index 3282135a38e46a6702b7fcbf0290031602e51524..d50d587ec5c359320f6ad231d0985c17cc56a5aa 100644 --- a/weboob/browser/filters/json.py +++ b/woob/browser/filters/json.py @@ -17,7 +17,7 @@ # You should have received a copy of the GNU Lesser General Public License # along with woob. If not, see . -from weboob.tools.compat import basestring +from woob.tools.compat import basestring from .base import _Filter, _NO_DEFAULT, Filter, debug, ItemNotFound diff --git a/weboob/browser/filters/standard.py b/woob/browser/filters/standard.py similarity index 99% rename from weboob/browser/filters/standard.py rename to woob/browser/filters/standard.py index 8cb4574ef4a144763de69bc6e07250ace3e4210a..c07690da8ebb9451b1282f30cd2f8b9680c84294 100644 --- a/weboob/browser/filters/standard.py +++ b/woob/browser/filters/standard.py @@ -35,10 +35,10 @@ from dateutil.parser import parse as parse_date from dateutil.tz import gettz -from weboob.browser.url import URL -from weboob.capabilities.base import Currency as BaseCurrency -from weboob.capabilities.base import empty -from weboob.tools.compat import basestring, long, parse_qs, unicode, urlparse +from woob.browser.url import URL +from woob.capabilities.base import Currency as BaseCurrency +from woob.capabilities.base import empty +from woob.tools.compat import basestring, long, parse_qs, unicode, urlparse from .base import _NO_DEFAULT, Filter, FilterError, ItemNotFound, _Filter, debug diff --git a/weboob/browser/nss.py b/woob/browser/nss.py similarity index 99% rename from weboob/browser/nss.py rename to woob/browser/nss.py index 08c04c7935834afb0eb7c4abfd031d31378a3294..ae4330abc7285e44db4e4fb259d6e48903e07b26 100644 --- a/weboob/browser/nss.py +++ b/woob/browser/nss.py @@ -47,7 +47,7 @@ raise ImportError('Please install python3-nss') from requests.packages.urllib3.util.ssl_ import ssl_wrap_socket as old_ssl_wrap_socket import requests # for AIA -from weboob.tools.log import getLogger +from woob.tools.log import getLogger __all__ = ['init_nss', 'inject_in_urllib3', 'certificate_db_filename'] diff --git a/weboob/browser/pages.py b/woob/browser/pages.py similarity index 99% rename from weboob/browser/pages.py rename to woob/browser/pages.py index ff31eedfc49e20d100c4058f6e3f1d5527a24392..aab5a1f05f652eae1e97bffcdd00a5aa1c6bf626 100644 --- a/weboob/browser/pages.py +++ b/woob/browser/pages.py @@ -31,11 +31,11 @@ import requests -from weboob.exceptions import ParseError, ModuleInstallError -from weboob.tools.compat import basestring, unicode, urljoin -from weboob.tools.json import json, mini_jsonpath -from weboob.tools.log import getLogger -from weboob.tools.pdf import decompress_pdf +from woob.exceptions import ParseError, ModuleInstallError +from woob.tools.compat import basestring, unicode, urljoin +from woob.tools.json import json, mini_jsonpath +from woob.tools.log import getLogger +from woob.tools.pdf import decompress_pdf from .exceptions import LoggedOut diff --git a/weboob/browser/profiles.py b/woob/browser/profiles.py similarity index 99% rename from weboob/browser/profiles.py rename to woob/browser/profiles.py index f5ce19573a0774b20f69c300e573f5365dac16e5..44642aabbcb2e34dde12e5e96239b6b83ee49afc 100644 --- a/weboob/browser/profiles.py +++ b/woob/browser/profiles.py @@ -20,7 +20,7 @@ from collections import OrderedDict -from weboob import __version__ +from woob import __version__ try: from requests.packages.urllib3.util.request import ACCEPT_ENCODING diff --git a/weboob/browser/retry.py b/woob/browser/retry.py similarity index 100% rename from weboob/browser/retry.py rename to woob/browser/retry.py diff --git a/weboob/browser/selenium.py b/woob/browser/selenium.py similarity index 99% rename from weboob/browser/selenium.py rename to woob/browser/selenium.py index 4660429951582f4d90a8357325c7d3f473393da4..f18f8440e832b89436a182907c2854fc925fc3b5 100644 --- a/weboob/browser/selenium.py +++ b/woob/browser/selenium.py @@ -45,8 +45,8 @@ from selenium.webdriver.common.by import By from selenium.webdriver.firefox.firefox_profile import FirefoxProfile from selenium.webdriver.remote.command import Command -from weboob.tools.log import getLogger -from weboob.tools.compat import ( +from woob.tools.log import getLogger +from woob.tools.compat import ( urljoin, urlparse, urlencode, parse_qsl, urlunparse, ) diff --git a/weboob/browser/sessions.py b/woob/browser/sessions.py similarity index 100% rename from weboob/browser/sessions.py rename to woob/browser/sessions.py diff --git a/weboob/browser/switch.py b/woob/browser/switch.py similarity index 100% rename from weboob/browser/switch.py rename to woob/browser/switch.py diff --git a/weboob/browser/tests/__init__.py b/woob/browser/tests/__init__.py similarity index 100% rename from weboob/browser/tests/__init__.py rename to woob/browser/tests/__init__.py diff --git a/weboob/browser/tests/filters.py b/woob/browser/tests/filters.py similarity index 97% rename from weboob/browser/tests/filters.py rename to woob/browser/tests/filters.py index d324a8339325a46f04a03a0a83f0693d714e6b7e..01e1bda566a9267d8aa7c2344a0bd4fc43c77bf1 100644 --- a/weboob/browser/tests/filters.py +++ b/woob/browser/tests/filters.py @@ -23,8 +23,8 @@ from dateutil.tz import gettz from lxml.html import fromstring -from weboob.browser.filters.html import FormValue, Link -from weboob.browser.filters.standard import RawText, DateTime +from woob.browser.filters.html import FormValue, Link +from woob.browser.filters.standard import RawText, DateTime class RawTextTest(TestCase): diff --git a/weboob/browser/tests/form.py b/woob/browser/tests/form.py similarity index 98% rename from weboob/browser/tests/form.py rename to woob/browser/tests/form.py index 3cc08b6b5a187f4717c3c1a2f7fc06f3e9526ecf..666569e7a9239b7a364f4a143cd3c51ae014352a 100644 --- a/weboob/browser/tests/form.py +++ b/woob/browser/tests/form.py @@ -21,8 +21,8 @@ import lxml.html -from weboob.browser import URL -from weboob.browser.pages import Form, FormSubmitWarning +from woob.browser import URL +from woob.browser.pages import Form, FormSubmitWarning # Mock that allows to represent a Page diff --git a/weboob/browser/tests/url.py b/woob/browser/tests/url.py similarity index 97% rename from weboob/browser/tests/url.py rename to woob/browser/tests/url.py index 79249a1af345dc096ff5f8f3d817d6fff4bc9a35..20489a491b5cd1167abd003373028ea9dd0a0210 100644 --- a/weboob/browser/tests/url.py +++ b/woob/browser/tests/url.py @@ -17,9 +17,9 @@ # along with woob. If not, see . from unittest import TestCase -from weboob.browser import PagesBrowser, URL -from weboob.browser.pages import Page -from weboob.browser.url import UrlNotResolvable +from woob.browser import PagesBrowser, URL +from woob.browser.pages import Page +from woob.browser.url import UrlNotResolvable class MyMockBrowserWithoutBrowser(object): diff --git a/weboob/browser/url.py b/woob/browser/url.py similarity index 98% rename from weboob/browser/url.py rename to woob/browser/url.py index c4c0cd9eeb56e06c6ae5106795eb916161986f49..f3426fdbeec1cc65495a1972153a379859cdabaa 100644 --- a/weboob/browser/url.py +++ b/woob/browser/url.py @@ -21,9 +21,9 @@ import re import requests -from weboob.tools.compat import basestring, unquote -from weboob.tools.regex_helper import normalize -from weboob.tools.misc import to_unicode +from woob.tools.compat import basestring, unquote +from woob.tools.regex_helper import normalize +from woob.tools.misc import to_unicode class UrlNotResolvable(Exception): diff --git a/weboob/capabilities/__init__.py b/woob/capabilities/__init__.py similarity index 100% rename from weboob/capabilities/__init__.py rename to woob/capabilities/__init__.py diff --git a/weboob/capabilities/account.py b/woob/capabilities/account.py similarity index 100% rename from weboob/capabilities/account.py rename to woob/capabilities/account.py diff --git a/weboob/capabilities/address.py b/woob/capabilities/address.py similarity index 100% rename from weboob/capabilities/address.py rename to woob/capabilities/address.py diff --git a/weboob/capabilities/audio.py b/woob/capabilities/audio.py similarity index 99% rename from weboob/capabilities/audio.py rename to woob/capabilities/audio.py index 046f543dfcb8bb2bd54c8fec3f47b0bd7f716554..2342620c67e48ce82ae729a935779b4b244a18c6 100644 --- a/weboob/capabilities/audio.py +++ b/woob/capabilities/audio.py @@ -19,7 +19,7 @@ import re -from weboob.tools.compat import unicode +from woob.tools.compat import unicode from .image import Thumbnail from .base import Field, StringField, IntField, BaseObject diff --git a/weboob/capabilities/audiostream.py b/woob/capabilities/audiostream.py similarity index 96% rename from weboob/capabilities/audiostream.py rename to woob/capabilities/audiostream.py index d35244b79a0b894277a1c7b2bd03dd024bd01734..a4d9d7275a7acdb5b8e96dafd59a5feb4ec3238c 100644 --- a/weboob/capabilities/audiostream.py +++ b/woob/capabilities/audiostream.py @@ -18,7 +18,7 @@ # along with woob. If not, see . -from weboob.tools.capabilities.streaminfo import StreamInfo +from woob.tools.capabilities.streaminfo import StreamInfo from .base import Field from .file import CapFile from .audio import CapAudio, BaseAudio diff --git a/weboob/capabilities/bands.py b/woob/capabilities/bands.py similarity index 100% rename from weboob/capabilities/bands.py rename to woob/capabilities/bands.py diff --git a/weboob/capabilities/bank/__init__.py b/woob/capabilities/bank/__init__.py similarity index 100% rename from weboob/capabilities/bank/__init__.py rename to woob/capabilities/bank/__init__.py diff --git a/weboob/capabilities/bank/base.py b/woob/capabilities/bank/base.py similarity index 98% rename from weboob/capabilities/bank/base.py rename to woob/capabilities/bank/base.py index a184ae903c4a27a7768631bfa385d32eb130cadb..168d08faa23686f6b9424ee3956c9eda9b281797 100644 --- a/weboob/capabilities/bank/base.py +++ b/woob/capabilities/bank/base.py @@ -21,14 +21,14 @@ from binascii import crc32 import re -from weboob.capabilities.base import ( +from woob.capabilities.base import ( BaseObject, Field, StringField, DecimalField, IntField, UserError, Currency, NotAvailable, EnumField, Enum, empty, find_object ) -from weboob.capabilities.date import DateField -from weboob.capabilities.collection import CapCollection -from weboob.tools.compat import unicode +from woob.capabilities.date import DateField +from woob.capabilities.collection import CapCollection +from woob.tools.compat import unicode __all__ = [ diff --git a/weboob/capabilities/bank/pfm.py b/woob/capabilities/bank/pfm.py similarity index 100% rename from weboob/capabilities/bank/pfm.py rename to woob/capabilities/bank/pfm.py diff --git a/weboob/capabilities/bank/rate.py b/woob/capabilities/bank/rate.py similarity index 95% rename from weboob/capabilities/bank/rate.py rename to woob/capabilities/bank/rate.py index 3da182d3d5035b9984fd2eeafbadd0ed059f13d0..26a636f9d23d03cc4acb8d394f8e8d3a4ee1a52c 100644 --- a/weboob/capabilities/bank/rate.py +++ b/woob/capabilities/bank/rate.py @@ -17,11 +17,11 @@ # You should have received a copy of the GNU Lesser General Public License # along with woob. If not, see . -from weboob.capabilities.base import ( +from woob.capabilities.base import ( BaseObject, StringField, DecimalField, Currency, Capability, ) -from weboob.capabilities.date import DateField +from woob.capabilities.date import DateField __all__ = [ diff --git a/weboob/capabilities/bank/transfer.py b/woob/capabilities/bank/transfer.py similarity index 98% rename from weboob/capabilities/bank/transfer.py rename to woob/capabilities/bank/transfer.py index 7afc1a0c3678bf085b481733f5c7d9f5db0d199b..1644b83abf28f45293891c85ef0633024c6367a7 100644 --- a/weboob/capabilities/bank/transfer.py +++ b/woob/capabilities/bank/transfer.py @@ -22,14 +22,14 @@ import re from unidecode import unidecode -from weboob.capabilities.base import ( +from woob.capabilities.base import ( BaseObject, Field, StringField, DecimalField, UserError, Currency, EnumField, Enum, Capability, empty, find_object, ) -from weboob.capabilities.date import DateField -from weboob.exceptions import BrowserQuestion -from weboob.tools.capabilities.bank.iban import is_iban_valid +from woob.capabilities.date import DateField +from woob.exceptions import BrowserQuestion +from woob.tools.capabilities.bank.iban import is_iban_valid from .base import ObjectNotFound, BaseAccount, CapBank, Account diff --git a/weboob/capabilities/bank/wealth.py b/woob/capabilities/bank/wealth.py similarity index 99% rename from weboob/capabilities/bank/wealth.py rename to woob/capabilities/bank/wealth.py index ab92be6c58d19e0f559f89ac1da65ac1e5b4398c..0ac0fd98745ec88865e3e9561d14cb3fa520cf7c 100644 --- a/weboob/capabilities/bank/wealth.py +++ b/woob/capabilities/bank/wealth.py @@ -17,11 +17,11 @@ # You should have received a copy of the GNU Lesser General Public License # along with woob. If not, see . -from weboob.capabilities.base import ( +from woob.capabilities.base import ( BaseObject, Field, StringField, DecimalField, IntField, EnumField, Enum, ) -from weboob.capabilities.date import DateField +from woob.capabilities.date import DateField from .base import Account, CapBank diff --git a/weboob/capabilities/base.py b/woob/capabilities/base.py similarity index 99% rename from weboob/capabilities/base.py rename to woob/capabilities/base.py index 1d16b732dc30317ec5af3c0de7e749fa6918632c..ab7b5755ee05b9aeb9fee5a050b04a0c4355418d 100644 --- a/weboob/capabilities/base.py +++ b/woob/capabilities/base.py @@ -24,8 +24,8 @@ from copy import deepcopy, copy import sys -from weboob.tools.compat import unicode, long, with_metaclass, StrConv -from weboob.tools.misc import to_unicode +from woob.tools.compat import unicode, long, with_metaclass, StrConv +from woob.tools.misc import to_unicode __all__ = ['UserError', 'FieldNotFound', 'NotAvailable', 'FetchError', diff --git a/weboob/capabilities/bill.py b/woob/capabilities/bill.py similarity index 100% rename from weboob/capabilities/bill.py rename to woob/capabilities/bill.py diff --git a/weboob/capabilities/bugtracker.py b/woob/capabilities/bugtracker.py similarity index 99% rename from weboob/capabilities/bugtracker.py rename to woob/capabilities/bugtracker.py index 67580bbdfa92cbeca62f6322aa5a97f0e5ba76e6..af5b1d312a30d4b152be4180397a6a5052bb4ddc 100644 --- a/weboob/capabilities/bugtracker.py +++ b/woob/capabilities/bugtracker.py @@ -17,7 +17,7 @@ # You should have received a copy of the GNU Lesser General Public License # along with woob. If not, see . -from weboob.tools.compat import unicode +from woob.tools.compat import unicode from .base import Capability, BaseObject, Field, StringField,\ IntField, UserError, Enum diff --git a/weboob/capabilities/calendar.py b/woob/capabilities/calendar.py similarity index 99% rename from weboob/capabilities/calendar.py rename to woob/capabilities/calendar.py index b077dda81762d4060d34af0461689732b1cee424..7ebaa2b04acb0ada0e047b720400ef7c8e6cdf04 100644 --- a/weboob/capabilities/calendar.py +++ b/woob/capabilities/calendar.py @@ -26,7 +26,7 @@ from .address import compat_field, PostalAddress from datetime import time, datetime -from weboob.tools.date import parse_date +from woob.tools.date import parse_date __all__ = ['BaseCalendarEvent', 'CapCalendarEvent'] diff --git a/weboob/capabilities/captcha.py b/woob/capabilities/captcha.py similarity index 100% rename from weboob/capabilities/captcha.py rename to woob/capabilities/captcha.py diff --git a/weboob/capabilities/chat.py b/woob/capabilities/chat.py similarity index 100% rename from weboob/capabilities/chat.py rename to woob/capabilities/chat.py diff --git a/weboob/capabilities/cinema.py b/woob/capabilities/cinema.py similarity index 100% rename from weboob/capabilities/cinema.py rename to woob/capabilities/cinema.py diff --git a/weboob/capabilities/collection.py b/woob/capabilities/collection.py similarity index 100% rename from weboob/capabilities/collection.py rename to woob/capabilities/collection.py diff --git a/weboob/capabilities/contact.py b/woob/capabilities/contact.py similarity index 99% rename from weboob/capabilities/contact.py rename to woob/capabilities/contact.py index 69c06b0633935e72ca20cbd9319a5c2584935502..ac84b5b19c344c4a72d46e9e9c1b4236ff3fdb28 100644 --- a/weboob/capabilities/contact.py +++ b/woob/capabilities/contact.py @@ -20,7 +20,7 @@ from collections import OrderedDict from datetime import datetime -from weboob.tools.compat import unicode, basestring +from woob.tools.compat import unicode, basestring from dateutil import rrule from .base import Capability, BaseObject, Field, StringField, BytesField, IntField, \ diff --git a/weboob/capabilities/content.py b/woob/capabilities/content.py similarity index 100% rename from weboob/capabilities/content.py rename to woob/capabilities/content.py diff --git a/weboob/capabilities/date.py b/woob/capabilities/date.py similarity index 94% rename from weboob/capabilities/date.py rename to woob/capabilities/date.py index 0e48943c1d3bfa9b1aaa66eeb4cb5e9b51708a18..75749a8b6838c11a8cff456b6c1c6eeb8d51a910 100644 --- a/weboob/capabilities/date.py +++ b/woob/capabilities/date.py @@ -19,9 +19,9 @@ import datetime -from weboob.tools.date import new_date, new_datetime -from weboob.capabilities.base import Field -from weboob.tools.compat import long +from woob.tools.date import new_date, new_datetime +from woob.capabilities.base import Field +from woob.tools.compat import long __all__ = ['DateField', 'TimeField', 'DeltaField'] diff --git a/weboob/capabilities/dating.py b/woob/capabilities/dating.py similarity index 100% rename from weboob/capabilities/dating.py rename to woob/capabilities/dating.py diff --git a/weboob/capabilities/file.py b/woob/capabilities/file.py similarity index 98% rename from weboob/capabilities/file.py rename to woob/capabilities/file.py index f6083e7816f11b318adc6caaa5aff113cafe7490..6f41e51b1566ae6620f144c343323e4d0ab155bb 100644 --- a/weboob/capabilities/file.py +++ b/woob/capabilities/file.py @@ -17,7 +17,7 @@ # You should have received a copy of the GNU Lesser General Public License # along with woob. If not, see . -from weboob.tools.compat import long +from woob.tools.compat import long from .base import Capability, BaseObject, NotAvailable, Field, StringField, IntField, Enum from .date import DateField diff --git a/weboob/capabilities/gallery.py b/woob/capabilities/gallery.py similarity index 97% rename from weboob/capabilities/gallery.py rename to woob/capabilities/gallery.py index 99e4404b4045b119696138f342ce0948c8b47bec..15b529882181d59933287ce2e88212158d8d7ea3 100644 --- a/weboob/capabilities/gallery.py +++ b/woob/capabilities/gallery.py @@ -18,8 +18,8 @@ # along with woob. If not, see . -from weboob.capabilities.image import BaseImage as CIBaseImage, Thumbnail -from weboob.tools.compat import unicode +from woob.capabilities.image import BaseImage as CIBaseImage, Thumbnail +from woob.tools.compat import unicode from .base import Capability, BaseObject, NotLoaded, Field, StringField, \ IntField, FloatField, Enum from .date import DateField diff --git a/weboob/capabilities/gauge.py b/woob/capabilities/gauge.py similarity index 100% rename from weboob/capabilities/gauge.py rename to woob/capabilities/gauge.py diff --git a/weboob/capabilities/geolocip.py b/woob/capabilities/geolocip.py similarity index 100% rename from weboob/capabilities/geolocip.py rename to woob/capabilities/geolocip.py diff --git a/weboob/capabilities/housing.py b/woob/capabilities/housing.py similarity index 100% rename from weboob/capabilities/housing.py rename to woob/capabilities/housing.py diff --git a/weboob/capabilities/image.py b/woob/capabilities/image.py similarity index 100% rename from weboob/capabilities/image.py rename to woob/capabilities/image.py diff --git a/weboob/capabilities/job.py b/woob/capabilities/job.py similarity index 100% rename from weboob/capabilities/job.py rename to woob/capabilities/job.py diff --git a/weboob/capabilities/library.py b/woob/capabilities/library.py similarity index 100% rename from weboob/capabilities/library.py rename to woob/capabilities/library.py diff --git a/weboob/capabilities/lyrics.py b/woob/capabilities/lyrics.py similarity index 100% rename from weboob/capabilities/lyrics.py rename to woob/capabilities/lyrics.py diff --git a/weboob/capabilities/messages.py b/woob/capabilities/messages.py similarity index 99% rename from weboob/capabilities/messages.py rename to woob/capabilities/messages.py index bc027204183272f912c06fbe0c6a47fe97f78490..f87da6b4c2d2270f94bd248484adce230aa7923d 100644 --- a/weboob/capabilities/messages.py +++ b/woob/capabilities/messages.py @@ -21,7 +21,7 @@ import datetime import time -from weboob.tools.compat import unicode +from woob.tools.compat import unicode from .base import Capability, BaseObject, NotLoaded, Field, StringField, \ IntField, UserError diff --git a/weboob/capabilities/parcel.py b/woob/capabilities/parcel.py similarity index 100% rename from weboob/capabilities/parcel.py rename to woob/capabilities/parcel.py diff --git a/weboob/capabilities/paste.py b/woob/capabilities/paste.py similarity index 98% rename from weboob/capabilities/paste.py rename to woob/capabilities/paste.py index 5e64584045a244989d4142a8a7ebdc83b0d00d5c..79589df77a4441e807c58eded2242642d24bd47e 100644 --- a/weboob/capabilities/paste.py +++ b/woob/capabilities/paste.py @@ -17,7 +17,7 @@ # You should have received a copy of the GNU Lesser General Public License # along with woob. If not, see . -from weboob.tools.compat import unicode +from woob.tools.compat import unicode from .base import Capability, BaseObject, NotLoaded, StringField, BoolField, UserError diff --git a/weboob/capabilities/pricecomparison.py b/woob/capabilities/pricecomparison.py similarity index 100% rename from weboob/capabilities/pricecomparison.py rename to woob/capabilities/pricecomparison.py diff --git a/weboob/capabilities/profile.py b/woob/capabilities/profile.py similarity index 100% rename from weboob/capabilities/profile.py rename to woob/capabilities/profile.py diff --git a/weboob/capabilities/radio.py b/woob/capabilities/radio.py similarity index 96% rename from weboob/capabilities/radio.py rename to woob/capabilities/radio.py index f6c23f140e2d59691a131c048ab17821e6498fe1..187dac561b8248318c6f58fc352ef131d60e23ba 100644 --- a/weboob/capabilities/radio.py +++ b/woob/capabilities/radio.py @@ -20,7 +20,7 @@ from .base import Capability, BaseObject, Field, StringField -from weboob.tools.capabilities.streaminfo import StreamInfo +from woob.tools.capabilities.streaminfo import StreamInfo __all__ = ['Radio', 'CapRadio'] diff --git a/weboob/capabilities/recipe.py b/woob/capabilities/recipe.py similarity index 100% rename from weboob/capabilities/recipe.py rename to woob/capabilities/recipe.py diff --git a/weboob/capabilities/rpg.py b/woob/capabilities/rpg.py similarity index 99% rename from weboob/capabilities/rpg.py rename to woob/capabilities/rpg.py index d86f77475bb798e8dbf5a52c17dca6eaa51bd187..b639f62dfc603e89b71d59729f40bb974b69a415 100644 --- a/weboob/capabilities/rpg.py +++ b/woob/capabilities/rpg.py @@ -18,7 +18,7 @@ # along with woob. If not, see . -from weboob.capabilities.base import find_object +from woob.capabilities.base import find_object from .base import ( BaseObject, diff --git a/weboob/capabilities/shop.py b/woob/capabilities/shop.py similarity index 100% rename from weboob/capabilities/shop.py rename to woob/capabilities/shop.py diff --git a/weboob/capabilities/subtitle.py b/woob/capabilities/subtitle.py similarity index 100% rename from weboob/capabilities/subtitle.py rename to woob/capabilities/subtitle.py diff --git a/weboob/capabilities/torrent.py b/woob/capabilities/torrent.py similarity index 100% rename from weboob/capabilities/torrent.py rename to woob/capabilities/torrent.py diff --git a/weboob/capabilities/translate.py b/woob/capabilities/translate.py similarity index 100% rename from weboob/capabilities/translate.py rename to woob/capabilities/translate.py diff --git a/weboob/capabilities/travel.py b/woob/capabilities/travel.py similarity index 100% rename from weboob/capabilities/travel.py rename to woob/capabilities/travel.py diff --git a/weboob/capabilities/video.py b/woob/capabilities/video.py similarity index 100% rename from weboob/capabilities/video.py rename to woob/capabilities/video.py diff --git a/weboob/capabilities/wealth.py b/woob/capabilities/wealth.py similarity index 96% rename from weboob/capabilities/wealth.py rename to woob/capabilities/wealth.py index 1e5c0de9b4928c9af2b753210993b0a4ab74596f..57e6306a5af21415e6501619c3f612c2fb614516 100644 --- a/weboob/capabilities/wealth.py +++ b/woob/capabilities/wealth.py @@ -20,7 +20,7 @@ from __future__ import unicode_literals # Temporary imports before moving these classes in this file -from weboob.capabilities.bank.wealth import ( +from woob.capabilities.bank.wealth import ( PerVersion, PerProviderType, Per, Investment, Pocket, MarketOrderType, MarketOrderDirection, MarketOrderPayment, MarketOrder, CapBankWealth, diff --git a/weboob/capabilities/weather.py b/woob/capabilities/weather.py similarity index 99% rename from weboob/capabilities/weather.py rename to woob/capabilities/weather.py index f4440f4afc7cb26beca60ad59639e9727bbed769..22fcef8cf92b3bbf5290a26342bd5c0b049584ac 100644 --- a/weboob/capabilities/weather.py +++ b/woob/capabilities/weather.py @@ -20,7 +20,7 @@ from datetime import datetime, date -from weboob.tools.compat import basestring, unicode +from woob.tools.compat import basestring, unicode from .base import Capability, BaseObject, Field, FloatField, \ StringField, IntField, UserError, NotLoaded, EnumField, Enum diff --git a/weboob/core/__init__.py b/woob/core/__init__.py similarity index 100% rename from weboob/core/__init__.py rename to woob/core/__init__.py diff --git a/weboob/core/backendscfg.py b/woob/core/backendscfg.py similarity index 99% rename from weboob/core/backendscfg.py rename to woob/core/backendscfg.py index b2113ad848338e17eb5ded89cb485ed79bc7b598..c94d677730eda3fd39aab90e2469f45c8dc22e3e 100644 --- a/weboob/core/backendscfg.py +++ b/woob/core/backendscfg.py @@ -33,7 +33,7 @@ from logging import warning from subprocess import check_output, CalledProcessError -from weboob.tools.compat import unicode +from woob.tools.compat import unicode __all__ = ['BackendsConfig', 'BackendAlreadyExists'] diff --git a/weboob/core/bcall.py b/woob/core/bcall.py similarity index 97% rename from weboob/core/bcall.py rename to woob/core/bcall.py index da8126c116225a7e8c745d81376cd54642bb3195..cbb39539ff5cf22abfb98d766a7721bdf817c294 100644 --- a/weboob/core/bcall.py +++ b/woob/core/bcall.py @@ -25,10 +25,10 @@ except ImportError: import queue as Queue -from weboob.capabilities.base import BaseObject -from weboob.tools.compat import basestring -from weboob.tools.misc import get_backtrace -from weboob.tools.log import getLogger +from woob.capabilities.base import BaseObject +from woob.tools.compat import basestring +from woob.tools.misc import get_backtrace +from woob.tools.log import getLogger __all__ = ['BackendsCall', 'CallErrors'] diff --git a/weboob/core/modules.py b/woob/core/modules.py similarity index 97% rename from weboob/core/modules.py rename to woob/core/modules.py index 8fb4e118f9b6a9b5a0e64080d3d610370397aa35..9cd07eae3f04fa395c778a41427e8a68a697d547 100644 --- a/weboob/core/modules.py +++ b/woob/core/modules.py @@ -21,10 +21,10 @@ import imp import logging -from weboob.tools.backend import Module, BackendConfig -from weboob.tools.compat import basestring -from weboob.tools.log import getLogger -from weboob.exceptions import ModuleLoadError +from woob.tools.backend import Module, BackendConfig +from woob.tools.compat import basestring +from woob.tools.log import getLogger +from woob.exceptions import ModuleLoadError __all__ = ['LoadedModule', 'ModulesLoader', 'RepositoryModulesLoader'] diff --git a/weboob/core/ouiboube.py b/woob/core/ouiboube.py similarity index 97% rename from weboob/core/ouiboube.py rename to woob/core/ouiboube.py index 5a3f42860204b02d64d6484025ebb2ef51db509f..735de88b55067ba44b842426beeb4a504795a4c3 100644 --- a/weboob/core/ouiboube.py +++ b/woob/core/ouiboube.py @@ -20,17 +20,17 @@ import os from pathlib import Path -from weboob.core.bcall import BackendsCall -from weboob.core.modules import ModulesLoader, RepositoryModulesLoader -from weboob.core.backendscfg import BackendsConfig -from weboob.core.requests import RequestsManager -from weboob.core.repositories import Repositories, PrintProgress -from weboob.core.scheduler import Scheduler -from weboob.tools.backend import Module -from weboob.tools.compat import basestring, unicode -from weboob.tools.config.iconfig import ConfigError -from weboob.tools.log import getLogger -from weboob.exceptions import ModuleLoadError +from woob.core.bcall import BackendsCall +from woob.core.modules import ModulesLoader, RepositoryModulesLoader +from woob.core.backendscfg import BackendsConfig +from woob.core.requests import RequestsManager +from woob.core.repositories import Repositories, PrintProgress +from woob.core.scheduler import Scheduler +from woob.tools.backend import Module +from woob.tools.compat import basestring, unicode +from woob.tools.config.iconfig import ConfigError +from woob.tools.log import getLogger +from woob.exceptions import ModuleLoadError __all__ = ['WebNip', 'Weboob'] diff --git a/weboob/core/repositories.py b/woob/core/repositories.py similarity index 98% rename from weboob/core/repositories.py rename to woob/core/repositories.py index bdad299402c8a13245d6d28fcbb65fc70137369b..033d6a05b27a6b04f64c4e9a06e4f4d52946e5da 100644 --- a/weboob/core/repositories.py +++ b/woob/core/repositories.py @@ -33,11 +33,11 @@ from io import BytesIO, StringIO from tempfile import NamedTemporaryFile -from weboob.exceptions import BrowserHTTPError, BrowserHTTPNotFound, ModuleInstallError +from woob.exceptions import BrowserHTTPError, BrowserHTTPNotFound, ModuleInstallError from .modules import LoadedModule -from weboob.tools.log import getLogger -from weboob.tools.misc import get_backtrace, to_unicode, find_exe -from weboob.tools.compat import basestring, unicode +from woob.tools.log import getLogger +from woob.tools.misc import get_backtrace, to_unicode, find_exe +from woob.tools.compat import basestring, unicode try: from ConfigParser import RawConfigParser, DEFAULTSECT except ImportError: @@ -488,9 +488,9 @@ def __init__(self, workdir, datadir, version): self.load() def load_browser(self): - from weboob.browser.browsers import Browser - from weboob.browser.profiles import Woob as WoobProfile - from weboob.tools.compat import getproxies + from woob.browser.browsers import Browser + from woob.browser.profiles import Woob as WoobProfile + from woob.tools.compat import getproxies class WoobBrowser(Browser): PROFILE = WoobProfile(self.version) diff --git a/weboob/core/requests.py b/woob/core/requests.py similarity index 100% rename from weboob/core/requests.py rename to woob/core/requests.py diff --git a/weboob/core/scheduler.py b/woob/core/scheduler.py similarity index 98% rename from weboob/core/scheduler.py rename to woob/core/scheduler.py index c3831808584a0eb309904f9f0e84967ab47b3331..80bf2dd598277b7aa91b4bd941a15b123f648f23 100644 --- a/weboob/core/scheduler.py +++ b/woob/core/scheduler.py @@ -26,8 +26,8 @@ except ImportError: from threading import Timer -from weboob.tools.log import getLogger -from weboob.tools.misc import get_backtrace +from woob.tools.log import getLogger +from woob.tools.misc import get_backtrace __all__ = ['Scheduler'] diff --git a/weboob/core/woob.py b/woob/core/woob.py similarity index 100% rename from weboob/core/woob.py rename to woob/core/woob.py diff --git a/weboob/exceptions.py b/woob/exceptions.py similarity index 98% rename from weboob/exceptions.py rename to woob/exceptions.py index 34dca0948ef87b785c87f0b5d25964374b522146..8125e5cd73353f573a4ad56aa8107eb8f55ff003 100644 --- a/weboob/exceptions.py +++ b/woob/exceptions.py @@ -19,8 +19,8 @@ import warnings -from weboob.tools.misc import to_unicode -from weboob.tools.compat import StrConv +from woob.tools.misc import to_unicode +from woob.tools.compat import StrConv class BrowserIncorrectPassword(Exception): diff --git a/weboob/tools/__init__.py b/woob/tools/__init__.py similarity index 100% rename from weboob/tools/__init__.py rename to woob/tools/__init__.py diff --git a/weboob/tools/application/__init__.py b/woob/tools/application/__init__.py similarity index 100% rename from weboob/tools/application/__init__.py rename to woob/tools/application/__init__.py diff --git a/weboob/tools/application/base.py b/woob/tools/application/base.py similarity index 96% rename from weboob/tools/application/base.py rename to woob/tools/application/base.py index af79527096a04e55c5005a63c8d6510a4876f10b..c97624cb9436285dbd9ea665184921ab115dd738 100644 --- a/weboob/tools/application/base.py +++ b/woob/tools/application/base.py @@ -29,14 +29,14 @@ import sys import warnings -from weboob.capabilities.base import ConversionWarning, BaseObject -from weboob.core import Woob, CallErrors -from weboob.core.backendscfg import BackendsConfig -from weboob.tools.config.iconfig import ConfigError -from weboob.exceptions import FormFieldConversionWarning -from weboob.tools.log import createColoredFormatter, getLogger, DEBUG_FILTERS, settings as log_settings -from weboob.tools.misc import to_unicode, guess_encoding -from weboob.tools.compat import unicode +from woob.capabilities.base import ConversionWarning, BaseObject +from woob.core import Woob, CallErrors +from woob.core.backendscfg import BackendsConfig +from woob.tools.config.iconfig import ConfigError +from woob.exceptions import FormFieldConversionWarning +from woob.tools.log import createColoredFormatter, getLogger, DEBUG_FILTERS, settings as log_settings +from woob.tools.misc import to_unicode, guess_encoding +from woob.tools.compat import unicode from .results import ResultsConditionError @@ -228,7 +228,7 @@ def create_storage(self, path=None, klass=None, localonly=False): :rtype: :class:`woob.tools.storage.IStorage` """ if klass is None: - from weboob.tools.storage import StandardStorage + from woob.tools.storage import StandardStorage klass = StandardStorage if path is None: @@ -261,7 +261,7 @@ def load_config(self, path=None, klass=None): :rtype: :class:`woob.tools.config.iconfig.IConfig` """ if klass is None: - from weboob.tools.config.iniconfig import INIConfig + from woob.tools.config.iniconfig import INIConfig klass = INIConfig if path is None: @@ -480,7 +480,7 @@ def setup_logging(cls, level, handlers): logging.root.addHandler(handler) def setup_nss(self): - from weboob.browser.nss import ( + from woob.browser.nss import ( init_nss, inject_in_urllib3, create_cert_db, certificate_db_filename, ) diff --git a/weboob/tools/application/captcha.py b/woob/tools/application/captcha.py similarity index 94% rename from weboob/tools/application/captcha.py rename to woob/tools/application/captcha.py index f1e0291a52703751e211bbd8380f7121bce94289..15c64771c4d083b9e39d55a07ef0703ce401e338 100644 --- a/weboob/tools/application/captcha.py +++ b/woob/tools/application/captcha.py @@ -4,8 +4,8 @@ from threading import Lock, Event -from weboob.capabilities.captcha import CapCaptchaSolver -from weboob.core import Woob +from woob.capabilities.captcha import CapCaptchaSolver +from woob.core import Woob __all__ = ['CaptchaMixin'] diff --git a/weboob/tools/application/console.py b/woob/tools/application/console.py similarity index 98% rename from weboob/tools/application/console.py rename to woob/tools/application/console.py index 951b5def9ef00f698ded3b2c1f49d335f82e4707..9e9c073003ea506e43159f9ee969ab1996803c00 100644 --- a/weboob/tools/application/console.py +++ b/woob/tools/application/console.py @@ -30,17 +30,17 @@ import sys import os -from weboob.capabilities import UserError -from weboob.capabilities.account import CapAccount, Account, AccountRegisterError -from weboob.core.backendscfg import BackendAlreadyExists -from weboob.core.repositories import IProgress -from weboob.exceptions import BrowserUnavailable, BrowserIncorrectPassword, BrowserForbidden, \ +from woob.capabilities import UserError +from woob.capabilities.account import CapAccount, Account, AccountRegisterError +from woob.core.backendscfg import BackendAlreadyExists +from woob.core.repositories import IProgress +from woob.exceptions import BrowserUnavailable, BrowserIncorrectPassword, BrowserForbidden, \ BrowserSSLError, BrowserQuestion, BrowserHTTPSDowngrade, \ ModuleInstallError, ModuleLoadError, NoAccountsException, \ ActionNeeded, CaptchaQuestion, NeedInteractiveFor2FA -from weboob.tools.value import Value, ValueBool, ValueFloat, ValueInt, ValueBackendPassword -from weboob.tools.misc import to_unicode -from weboob.tools.compat import unicode, long +from woob.tools.value import Value, ValueBool, ValueFloat, ValueInt, ValueBackendPassword +from woob.tools.misc import to_unicode +from woob.tools.compat import unicode, long from .base import Application, MoreResultsAvailable diff --git a/weboob/tools/application/formatters/__init__.py b/woob/tools/application/formatters/__init__.py similarity index 100% rename from weboob/tools/application/formatters/__init__.py rename to woob/tools/application/formatters/__init__.py diff --git a/weboob/tools/application/formatters/csv.py b/woob/tools/application/formatters/csv.py similarity index 95% rename from weboob/tools/application/formatters/csv.py rename to woob/tools/application/formatters/csv.py index 9fb032f6625eb5788c69baadcdd1dc04d156534d..f42de8cfb596d9d8dea718a761658bfd70dac053 100644 --- a/weboob/tools/application/formatters/csv.py +++ b/woob/tools/application/formatters/csv.py @@ -23,8 +23,8 @@ import csv import sys -from weboob.tools.compat import basestring -from weboob.tools.misc import to_unicode +from woob.tools.compat import basestring +from woob.tools.misc import to_unicode from .iformatter import IFormatter diff --git a/weboob/tools/application/formatters/iformatter.py b/woob/tools/application/formatters/iformatter.py similarity index 97% rename from weboob/tools/application/formatters/iformatter.py rename to woob/tools/application/formatters/iformatter.py index 5da35d4e530c8faae1fea2e9bd07ddae2941a931..3fa760c5198773a7fad24a59172380dcc058f625 100644 --- a/weboob/tools/application/formatters/iformatter.py +++ b/woob/tools/application/formatters/iformatter.py @@ -61,10 +61,10 @@ def readch(): finally: termios.tcsetattr(fd, termios.TCSADRAIN, old_settings) -from weboob.capabilities.base import BaseObject -from weboob.tools.application.console import ConsoleApplication -from weboob.tools.compat import basestring -from weboob.tools.misc import guess_encoding +from woob.capabilities.base import BaseObject +from woob.tools.application.console import ConsoleApplication +from woob.tools.compat import basestring +from woob.tools.misc import guess_encoding __all__ = ['IFormatter', 'MandatoryFieldsNotFound'] diff --git a/weboob/tools/application/formatters/json.py b/woob/tools/application/formatters/json.py similarity index 97% rename from weboob/tools/application/formatters/json.py rename to woob/tools/application/formatters/json.py index 0adaeaf3dcccaca1e6fdac6ce951e80a9db24d74..c2ee02966348cac0d07c7f71f5a3b19592bed32b 100644 --- a/weboob/tools/application/formatters/json.py +++ b/woob/tools/application/formatters/json.py @@ -18,7 +18,7 @@ # along with woob. If not, see . -from weboob.tools.json import json, WoobEncoder +from woob.tools.json import json, WoobEncoder from .iformatter import IFormatter diff --git a/weboob/tools/application/formatters/load.py b/woob/tools/application/formatters/load.py similarity index 100% rename from weboob/tools/application/formatters/load.py rename to woob/tools/application/formatters/load.py diff --git a/weboob/tools/application/formatters/multiline.py b/woob/tools/application/formatters/multiline.py similarity index 95% rename from weboob/tools/application/formatters/multiline.py rename to woob/tools/application/formatters/multiline.py index fd975bd1919848d956dcfd3784c9f457521cc069..6afb7d0d07c957f1c96e71a6725bd67710e7ebbd 100644 --- a/weboob/tools/application/formatters/multiline.py +++ b/woob/tools/application/formatters/multiline.py @@ -18,7 +18,7 @@ # along with woob. If not, see . -from weboob.capabilities.base import NotLoaded, NotAvailable +from woob.capabilities.base import NotLoaded, NotAvailable from .iformatter import IFormatter diff --git a/weboob/tools/application/formatters/simple.py b/woob/tools/application/formatters/simple.py similarity index 100% rename from weboob/tools/application/formatters/simple.py rename to woob/tools/application/formatters/simple.py diff --git a/weboob/tools/application/formatters/table.py b/woob/tools/application/formatters/table.py similarity index 98% rename from weboob/tools/application/formatters/table.py rename to woob/tools/application/formatters/table.py index e373a38e1371f614d1493b653d12fe0fea1e3338..9535a48e2ffefb57bd13905266f8b7b51e11d82d 100644 --- a/weboob/tools/application/formatters/table.py +++ b/woob/tools/application/formatters/table.py @@ -19,7 +19,7 @@ from prettytable import PrettyTable -from weboob.capabilities.base import empty +from woob.capabilities.base import empty from .iformatter import IFormatter diff --git a/weboob/tools/application/formatters/webkit/__init__.py b/woob/tools/application/formatters/webkit/__init__.py similarity index 100% rename from weboob/tools/application/formatters/webkit/__init__.py rename to woob/tools/application/formatters/webkit/__init__.py diff --git a/weboob/tools/application/formatters/webkit/webkitgtk.py b/woob/tools/application/formatters/webkit/webkitgtk.py similarity index 97% rename from weboob/tools/application/formatters/webkit/webkitgtk.py rename to woob/tools/application/formatters/webkit/webkitgtk.py index 7c5333ffb2590e9ff7e2b6ad5e7e31b239f7bdbc..2a4f3ff5aa5df9a1bb8acee6c109ca7746ba3f7e 100644 --- a/weboob/tools/application/formatters/webkit/webkitgtk.py +++ b/woob/tools/application/formatters/webkit/webkitgtk.py @@ -23,7 +23,7 @@ import gtk import webkit -from weboob.tools.application.javascript import get_javascript +from woob.tools.application.javascript import get_javascript from ..table import HTMLTableFormatter diff --git a/weboob/tools/application/javascript.py b/woob/tools/application/javascript.py similarity index 100% rename from weboob/tools/application/javascript.py rename to woob/tools/application/javascript.py diff --git a/weboob/tools/application/media_player.py b/woob/tools/application/media_player.py similarity index 99% rename from weboob/tools/application/media_player.py rename to woob/tools/application/media_player.py index a39233d35c83ebae73174992f570d7213388c767..48a12a8704d6a022f4d05d78616240ec867cc969 100644 --- a/weboob/tools/application/media_player.py +++ b/woob/tools/application/media_player.py @@ -28,7 +28,7 @@ import requests -from weboob.tools.log import getLogger +from woob.tools.log import getLogger __all__ = ['InvalidMediaPlayer', 'MediaPlayer', 'MediaPlayerNotFound'] diff --git a/weboob/tools/application/repl.py b/woob/tools/application/repl.py similarity index 98% rename from weboob/tools/application/repl.py rename to woob/tools/application/repl.py index 73f0cb588524fd7b1e9904b01ae16b537a42cb4c..061cede0d4923aeef6db73a4bec055b7062cf205 100644 --- a/weboob/tools/application/repl.py +++ b/woob/tools/application/repl.py @@ -31,14 +31,14 @@ from datetime import datetime from optparse import IndentedHelpFormatter, OptionGroup, OptionParser -from weboob.capabilities.base import BaseObject, FieldNotFound, UserError, empty -from weboob.capabilities.collection import BaseCollection, CapCollection, Collection, CollectionNotFound -from weboob.core import CallErrors -from weboob.exceptions import BrowserQuestion, BrowserRedirect, DecoupledValidation -from weboob.tools.application.formatters.iformatter import MandatoryFieldsNotFound -from weboob.tools.compat import basestring, range, unicode -from weboob.tools.misc import to_unicode -from weboob.tools.path import WorkingPath +from woob.capabilities.base import BaseObject, FieldNotFound, UserError, empty +from woob.capabilities.collection import BaseCollection, CapCollection, Collection, CollectionNotFound +from woob.core import CallErrors +from woob.exceptions import BrowserQuestion, BrowserRedirect, DecoupledValidation +from woob.tools.application.formatters.iformatter import MandatoryFieldsNotFound +from woob.tools.compat import basestring, range, unicode +from woob.tools.misc import to_unicode +from woob.tools.path import WorkingPath from .console import BackendNotGiven, ConsoleApplication from .formatters.load import FormatterLoadError, FormattersLoader @@ -1347,7 +1347,7 @@ def do_debug(self, line): Launch a debug Python shell """ - from weboob.applications.debug import AppDebug + from woob.applications.debug import AppDebug app = AppDebug() locs = dict(application=self, woob=self.woob) diff --git a/weboob/tools/application/results.py b/woob/tools/application/results.py similarity index 97% rename from weboob/tools/application/results.py rename to woob/tools/application/results.py index 4db6a5bc8b0dcf6da691db947f394ffaa99065e8..7ec14dd8f9b5f2be2be0d740f2f47e67349a585d 100644 --- a/weboob/tools/application/results.py +++ b/woob/tools/application/results.py @@ -17,8 +17,8 @@ # You should have received a copy of the GNU Lesser General Public License # along with woob. If not, see . -from weboob.capabilities import UserError -from weboob.tools.compat import unicode +from woob.capabilities import UserError +from woob.tools.compat import unicode __all__ = ['ResultsCondition', 'ResultsConditionError'] @@ -99,7 +99,7 @@ def __init__(self, condition_str): self.condition_str = condition_str def is_valid(self, obj): - import weboob.tools.date as date_utils + import woob.tools.date as date_utils import re from datetime import date, datetime, timedelta d = obj.to_dict() diff --git a/weboob/tools/backend.py b/woob/tools/backend.py similarity index 98% rename from weboob/tools/backend.py rename to woob/tools/backend.py index 2e3cd872a97f867bdcd858ddf149b13032e18324..652aa689c6c28032d5e1ad6aded0daf7a4db6bac 100644 --- a/weboob/tools/backend.py +++ b/woob/tools/backend.py @@ -21,13 +21,13 @@ from copy import copy from threading import RLock -from weboob.capabilities.base import BaseObject, Capability, FieldNotFound, NotAvailable, NotLoaded -from weboob.exceptions import ModuleInstallError -from weboob.tools.compat import basestring, getproxies -from weboob.tools.log import getLogger -from weboob.tools.json import json -from weboob.tools.misc import iter_fields -from weboob.tools.value import ValuesDict +from woob.capabilities.base import BaseObject, Capability, FieldNotFound, NotAvailable, NotLoaded +from woob.exceptions import ModuleInstallError +from woob.tools.compat import basestring, getproxies +from woob.tools.log import getLogger +from woob.tools.json import json +from woob.tools.misc import iter_fields +from woob.tools.value import ValuesDict __all__ = ['BackendStorage', 'BackendConfig', 'Module'] diff --git a/weboob/tools/blinkpdf.py b/woob/tools/blinkpdf.py similarity index 100% rename from weboob/tools/blinkpdf.py rename to woob/tools/blinkpdf.py diff --git a/weboob/tools/capabilities/__init__.py b/woob/tools/capabilities/__init__.py similarity index 100% rename from weboob/tools/capabilities/__init__.py rename to woob/tools/capabilities/__init__.py diff --git a/weboob/tools/capabilities/audio/__init__.py b/woob/tools/capabilities/audio/__init__.py similarity index 100% rename from weboob/tools/capabilities/audio/__init__.py rename to woob/tools/capabilities/audio/__init__.py diff --git a/weboob/tools/capabilities/audio/audio.py b/woob/tools/capabilities/audio/audio.py similarity index 96% rename from weboob/tools/capabilities/audio/audio.py rename to woob/tools/capabilities/audio/audio.py index f8d958abd33a12e07ce9090d1e55bd2d4a527121..9592fd38bbcd9f4d1f88a061c6eb0a3741f1491c 100755 --- a/weboob/tools/capabilities/audio/audio.py +++ b/woob/tools/capabilities/audio/audio.py @@ -17,7 +17,7 @@ # You should have received a copy of the GNU Lesser General Public License # along with woob. If not, see . -from weboob.browser.filters.standard import Format +from woob.browser.filters.standard import Format class AlbumIdFilter(Format): diff --git a/weboob/tools/capabilities/bank/__init__.py b/woob/tools/capabilities/bank/__init__.py similarity index 100% rename from weboob/tools/capabilities/bank/__init__.py rename to woob/tools/capabilities/bank/__init__.py diff --git a/weboob/tools/capabilities/bank/bank_transfer.py b/woob/tools/capabilities/bank/bank_transfer.py similarity index 100% rename from weboob/tools/capabilities/bank/bank_transfer.py rename to woob/tools/capabilities/bank/bank_transfer.py diff --git a/weboob/tools/capabilities/bank/data_matching.py b/woob/tools/capabilities/bank/data_matching.py similarity index 98% rename from weboob/tools/capabilities/bank/data_matching.py rename to woob/tools/capabilities/bank/data_matching.py index 8cf01944ac58e6dd47006864f52f3df4b492e834..a9c1a53401a87c30432b6e02867a663be77e5ff6 100644 --- a/weboob/tools/capabilities/bank/data_matching.py +++ b/woob/tools/capabilities/bank/data_matching.py @@ -17,7 +17,7 @@ # You should have received a copy of the GNU Lesser General Public License # along with woob. If not, see . -from weboob.tools.capabilities.bank import AccountDiff +from woob.tools.capabilities.bank import AccountDiff __all__ = ['diff_accounts'] diff --git a/weboob/tools/capabilities/bank/iban.py b/woob/tools/capabilities/bank/iban.py similarity index 98% rename from weboob/tools/capabilities/bank/iban.py rename to woob/tools/capabilities/bank/iban.py index 03e48354c6c8d81da137add703d5ef59ec721a0b..69b2128f7c59143264f9996c6c4822588a5ca4ba 100644 --- a/weboob/tools/capabilities/bank/iban.py +++ b/woob/tools/capabilities/bank/iban.py @@ -20,7 +20,7 @@ import re -from weboob.tools.compat import unicode +from woob.tools.compat import unicode _country2length = dict( AL=28, AD=24, AT=20, AZ=28, BE=16, BH=22, BA=20, BR=29, diff --git a/weboob/tools/capabilities/bank/investments.py b/woob/tools/capabilities/bank/investments.py similarity index 95% rename from weboob/tools/capabilities/bank/investments.py rename to woob/tools/capabilities/bank/investments.py index feb4155f019c09e0e4d6880475cd382547871fbe..11a4dabec90ff4d33bf32901e66a4526adb805ea 100644 --- a/weboob/tools/capabilities/bank/investments.py +++ b/woob/tools/capabilities/bank/investments.py @@ -21,10 +21,10 @@ import re -from weboob.tools.compat import basestring -from weboob.capabilities.base import NotAvailable -from weboob.capabilities.wealth import Investment -from weboob.browser.filters.base import Filter, FilterError, debug +from woob.tools.compat import basestring +from woob.capabilities.base import NotAvailable +from woob.capabilities.wealth import Investment +from woob.browser.filters.base import Filter, FilterError, debug def is_isin_valid(isin): """ diff --git a/weboob/tools/capabilities/bank/test.py b/woob/tools/capabilities/bank/test.py similarity index 96% rename from weboob/tools/capabilities/bank/test.py rename to woob/tools/capabilities/bank/test.py index 93a8b1d8dffe8803e5e36d7922b93281fe5f0b3a..c4efcbc00d7832f53ffaa0f5b0df85ac6d5fef03 100644 --- a/weboob/tools/capabilities/bank/test.py +++ b/woob/tools/capabilities/bank/test.py @@ -19,13 +19,13 @@ from datetime import date -from weboob.capabilities.base import empty, NotLoaded -from weboob.capabilities.bank import CapTransfer -from weboob.capabilities.wealth import CapBankWealth -from weboob.exceptions import NoAccountsException -from weboob.tools.capabilities.bank.iban import is_iban_valid -from weboob.tools.capabilities.bank.investments import is_isin_valid -from weboob.tools.date import new_date +from woob.capabilities.base import empty, NotLoaded +from woob.capabilities.bank import CapTransfer +from woob.capabilities.wealth import CapBankWealth +from woob.exceptions import NoAccountsException +from woob.tools.capabilities.bank.iban import is_iban_valid +from woob.tools.capabilities.bank.investments import is_isin_valid +from woob.tools.date import new_date __all__ = ('BankStandardTest',) diff --git a/weboob/tools/capabilities/bank/transactions.py b/woob/tools/capabilities/bank/transactions.py similarity index 96% rename from weboob/tools/capabilities/bank/transactions.py rename to woob/tools/capabilities/bank/transactions.py index 7823aaf6ef87fe93ad5dde62f1bc343f6e44e7cb..e9f702cb6fbc74755726608932b3adeb81cfc265 100644 --- a/weboob/tools/capabilities/bank/transactions.py +++ b/woob/tools/capabilities/bank/transactions.py @@ -22,16 +22,16 @@ import datetime import re -from weboob.capabilities.bank import Transaction, Account -from weboob.capabilities import NotAvailable, NotLoaded -from weboob.tools.misc import to_unicode -from weboob.tools.log import getLogger -from weboob.tools.date import new_datetime - -from weboob.exceptions import ParseError -from weboob.browser.elements import TableElement, ItemElement -from weboob.browser.filters.standard import Filter, CleanText, CleanDecimal -from weboob.browser.filters.html import TableCell +from woob.capabilities.bank import Transaction, Account +from woob.capabilities import NotAvailable, NotLoaded +from woob.tools.misc import to_unicode +from woob.tools.log import getLogger +from woob.tools.date import new_datetime + +from woob.exceptions import ParseError +from woob.browser.elements import TableElement, ItemElement +from woob.browser.filters.standard import Filter, CleanText, CleanDecimal +from woob.browser.filters.html import TableCell __all__ = [ diff --git a/weboob/tools/capabilities/bill/__init__.py b/woob/tools/capabilities/bill/__init__.py similarity index 100% rename from weboob/tools/capabilities/bill/__init__.py rename to woob/tools/capabilities/bill/__init__.py diff --git a/weboob/tools/capabilities/bill/documents.py b/woob/tools/capabilities/bill/documents.py similarity index 100% rename from weboob/tools/capabilities/bill/documents.py rename to woob/tools/capabilities/bill/documents.py diff --git a/weboob/tools/capabilities/housing/__init__.py b/woob/tools/capabilities/housing/__init__.py similarity index 100% rename from weboob/tools/capabilities/housing/__init__.py rename to woob/tools/capabilities/housing/__init__.py diff --git a/weboob/tools/capabilities/housing/housing.py b/woob/tools/capabilities/housing/housing.py similarity index 91% rename from weboob/tools/capabilities/housing/housing.py rename to woob/tools/capabilities/housing/housing.py index 2dc50513c8c15b5633bc85405253981166c7d963..7123e92e6647ad04120cbbedc59fb8475c4aec75 100755 --- a/weboob/tools/capabilities/housing/housing.py +++ b/woob/tools/capabilities/housing/housing.py @@ -17,8 +17,8 @@ # You should have received a copy of the GNU Lesser General Public License # along with woob. If not, see . -from weboob.browser.filters.standard import _Filter, Field, debug -from weboob.capabilities.base import empty +from woob.browser.filters.standard import _Filter, Field, debug +from woob.capabilities.base import empty from decimal import Decimal diff --git a/weboob/tools/capabilities/housing/housing_test.py b/woob/tools/capabilities/housing/housing_test.py similarity index 98% rename from weboob/tools/capabilities/housing/housing_test.py rename to woob/tools/capabilities/housing/housing_test.py index 60cf2b91a1eb5c95547e4e6370ff2c096bbb4147..97db7248dc8ae0bf5a8e0acb75fd4526ab615290 100755 --- a/weboob/tools/capabilities/housing/housing_test.py +++ b/woob/tools/capabilities/housing/housing_test.py @@ -22,8 +22,8 @@ import itertools from collections import Counter -from weboob.capabilities.base import empty -from weboob.capabilities.housing import POSTS_TYPES +from woob.capabilities.base import empty +from woob.capabilities.housing import POSTS_TYPES class HousingTest(object): diff --git a/weboob/tools/capabilities/paste.py b/woob/tools/capabilities/paste.py similarity index 98% rename from weboob/tools/capabilities/paste.py rename to woob/tools/capabilities/paste.py index bd598ceb926059834c6e09a42368dcc6d061a55b..cc2960e953f2d1584d04b4199a352d27e260abad 100644 --- a/weboob/tools/capabilities/paste.py +++ b/woob/tools/capabilities/paste.py @@ -20,7 +20,7 @@ from base64 import b64decode, b64encode import binascii -from weboob.capabilities.paste import CapPaste +from woob.capabilities.paste import CapPaste class BasePasteModule(CapPaste): diff --git a/weboob/tools/capabilities/recipe.py b/woob/tools/capabilities/recipe.py similarity index 99% rename from weboob/tools/capabilities/recipe.py rename to woob/tools/capabilities/recipe.py index b6f08f0021ae7b6f00c4f0788d379e67bad8483a..2d1fe27a377452b046e3fa1e5eccb33415f45f13 100644 --- a/weboob/tools/capabilities/recipe.py +++ b/woob/tools/capabilities/recipe.py @@ -24,7 +24,7 @@ import lxml.etree as ET import requests -from weboob.capabilities.base import empty +from woob.capabilities.base import empty __all__ = ['recipe_to_krecipes_xml'] diff --git a/weboob/tools/capabilities/streaminfo.py b/woob/tools/capabilities/streaminfo.py similarity index 94% rename from weboob/tools/capabilities/streaminfo.py rename to woob/tools/capabilities/streaminfo.py index 62b8674c360df841e410f18b2bd5e734e6b2ccaf..8d79aace267e659e0e80116493f2b9f4e2aed341 100644 --- a/weboob/tools/capabilities/streaminfo.py +++ b/woob/tools/capabilities/streaminfo.py @@ -18,7 +18,7 @@ # along with woob. If not, see . -from weboob.capabilities.base import BaseObject, StringField, NotLoaded +from woob.capabilities.base import BaseObject, StringField, NotLoaded __all__ = ['StreamInfo'] diff --git a/weboob/tools/capabilities/video/__init__.py b/woob/tools/capabilities/video/__init__.py similarity index 100% rename from weboob/tools/capabilities/video/__init__.py rename to woob/tools/capabilities/video/__init__.py diff --git a/weboob/tools/capabilities/video/ytdl.py b/woob/tools/capabilities/video/ytdl.py similarity index 88% rename from weboob/tools/capabilities/video/ytdl.py rename to woob/tools/capabilities/video/ytdl.py index 5b4a87e42b73d1f52eb05ad51bcfd6d7c118c3c4..715b5c581d444544be61ebe82bdcd6c8b8d42dc1 100644 --- a/weboob/tools/capabilities/video/ytdl.py +++ b/woob/tools/capabilities/video/ytdl.py @@ -20,12 +20,12 @@ from shutil import which import subprocess -from weboob.capabilities.base import NotAvailable -from weboob.capabilities.image import Thumbnail -from weboob.capabilities.video import BaseVideo -from weboob.tools.date import parse_date -from weboob.tools.json import json -from weboob.tools.compat import unicode +from woob.capabilities.base import NotAvailable +from woob.capabilities.image import Thumbnail +from woob.capabilities.video import BaseVideo +from woob.tools.date import parse_date +from woob.tools.json import json +from woob.tools.compat import unicode from datetime import timedelta diff --git a/weboob/tools/captcha/__init__.py b/woob/tools/captcha/__init__.py similarity index 100% rename from weboob/tools/captcha/__init__.py rename to woob/tools/captcha/__init__.py diff --git a/weboob/tools/captcha/virtkeyboard.py b/woob/tools/captcha/virtkeyboard.py similarity index 99% rename from weboob/tools/captcha/virtkeyboard.py rename to woob/tools/captcha/virtkeyboard.py index 19dbf866533142c3bf69f4f5a4ad7ef4a695b561..59577d856d07afbdeba2e7f8a66e4cc909b10bc4 100644 --- a/weboob/tools/captcha/virtkeyboard.py +++ b/woob/tools/captcha/virtkeyboard.py @@ -27,7 +27,7 @@ except ImportError: raise ImportError('Please install python-imaging') -from weboob.tools.compat import basestring +from woob.tools.compat import basestring class VirtKeyboardError(Exception): diff --git a/weboob/tools/compat.py b/woob/tools/compat.py similarity index 100% rename from weboob/tools/compat.py rename to woob/tools/compat.py diff --git a/weboob/tools/config/__init__.py b/woob/tools/config/__init__.py similarity index 100% rename from weboob/tools/config/__init__.py rename to woob/tools/config/__init__.py diff --git a/weboob/tools/config/dbmconfig.py b/woob/tools/config/dbmconfig.py similarity index 100% rename from weboob/tools/config/dbmconfig.py rename to woob/tools/config/dbmconfig.py diff --git a/weboob/tools/config/extra.py b/woob/tools/config/extra.py similarity index 100% rename from weboob/tools/config/extra.py rename to woob/tools/config/extra.py diff --git a/weboob/tools/config/iconfig.py b/woob/tools/config/iconfig.py similarity index 100% rename from weboob/tools/config/iconfig.py rename to woob/tools/config/iconfig.py diff --git a/weboob/tools/config/iniconfig.py b/woob/tools/config/iniconfig.py similarity index 98% rename from weboob/tools/config/iniconfig.py rename to woob/tools/config/iniconfig.py index 72e7f5fe1274b6a7aa6cf7cb750885db0b8d069b..7637110fd4e4a25ed9dcf08c1e2031282c57dd40 100644 --- a/weboob/tools/config/iniconfig.py +++ b/woob/tools/config/iniconfig.py @@ -29,7 +29,7 @@ import io import sys -from weboob.tools.compat import basestring, unicode +from woob.tools.compat import basestring, unicode from .iconfig import IConfig from .util import LOGGER diff --git a/weboob/tools/config/sqliteconfig.py b/woob/tools/config/sqliteconfig.py similarity index 99% rename from weboob/tools/config/sqliteconfig.py rename to woob/tools/config/sqliteconfig.py index 5598ba8892e462690b116c901002fa0d2b5f3663..557112e5fe8891ec037ecc049c073b93e997e413 100644 --- a/weboob/tools/config/sqliteconfig.py +++ b/woob/tools/config/sqliteconfig.py @@ -25,7 +25,7 @@ import yaml -from weboob.tools.compat import unicode +from woob.tools.compat import unicode from .iconfig import ConfigError, IConfig from .util import replace, time_buffer diff --git a/weboob/tools/config/util.py b/woob/tools/config/util.py similarity index 98% rename from weboob/tools/config/util.py rename to woob/tools/config/util.py index 2a12cfe57bc8d13d8995d0ed3cf9e3741044b317..e9887bdae9293370c2af8af43ffcf5fbabc1e288 100644 --- a/weboob/tools/config/util.py +++ b/woob/tools/config/util.py @@ -20,7 +20,7 @@ import os from datetime import datetime -from weboob.tools.log import getLogger +from woob.tools.log import getLogger __all__ = ['LOGGER', 'replace', 'time_buffer'] diff --git a/weboob/tools/config/yamlconfig.py b/woob/tools/config/yamlconfig.py similarity index 96% rename from weboob/tools/config/yamlconfig.py rename to woob/tools/config/yamlconfig.py index b8166c9e3315bdbefa9451734b4024d5f4f53064..78108d81ab97a96a9a3a88a8ac6b165cdd2e4790 100644 --- a/weboob/tools/config/yamlconfig.py +++ b/woob/tools/config/yamlconfig.py @@ -22,7 +22,7 @@ import tempfile import sys -import weboob.tools.date +import woob.tools.date import yaml from .iconfig import ConfigError, IConfig @@ -54,10 +54,10 @@ def ignore_aliases(self, data): WeboobNoAliasDumper = WoobNoAliasDumper -WoobDumper.add_representer(weboob.tools.date.date, +WoobDumper.add_representer(woob.tools.date.date, WoobDumper.represent_date) -WoobDumper.add_representer(weboob.tools.date.datetime, +WoobDumper.add_representer(woob.tools.date.datetime, WoobDumper.represent_datetime) diff --git a/weboob/tools/date.py b/woob/tools/date.py similarity index 100% rename from weboob/tools/date.py rename to woob/tools/date.py diff --git a/weboob/tools/decorators.py b/woob/tools/decorators.py similarity index 100% rename from weboob/tools/decorators.py rename to woob/tools/decorators.py diff --git a/weboob/tools/html.py b/woob/tools/html.py similarity index 96% rename from weboob/tools/html.py rename to woob/tools/html.py index ce232a58bca60f5913880c51a6d309c64942f8ac..8e12b99687ea73b131d567bb7ee9f5b7e903220f 100644 --- a/weboob/tools/html.py +++ b/woob/tools/html.py @@ -17,7 +17,7 @@ # You should have received a copy of the GNU Lesser General Public License # along with woob. If not, see . -from weboob.tools.compat import unicode +from woob.tools.compat import unicode __all__ = ['html2text'] diff --git a/weboob/tools/js.py b/woob/tools/js.py similarity index 98% rename from weboob/tools/js.py rename to woob/tools/js.py index 43809c284a688699c4f7feca14d5f5842ec75b2f..8cbcc7d88724811a732cf23777e0b771c20dbb09 100644 --- a/weboob/tools/js.py +++ b/woob/tools/js.py @@ -21,7 +21,7 @@ __all__ = ['Javascript'] -from weboob.tools.log import getLogger +from woob.tools.log import getLogger class Javascript(object): diff --git a/weboob/tools/json.py b/woob/tools/json.py similarity index 96% rename from weboob/tools/json.py rename to woob/tools/json.py index a422e7ab26f01e9c87d7c70614af616239de5d1a..a2969212457decda06656285b6a3087742cb8e4f 100644 --- a/weboob/tools/json.py +++ b/woob/tools/json.py @@ -35,8 +35,8 @@ # Python 2.6+ has a module similar to simplejson import json -from weboob.capabilities.base import BaseObject, NotAvailable, NotLoaded -from weboob.tools.compat import basestring +from woob.capabilities.base import BaseObject, NotAvailable, NotLoaded +from woob.tools.compat import basestring def mini_jsonpath(node, path): diff --git a/weboob/tools/log.py b/woob/tools/log.py similarity index 98% rename from weboob/tools/log.py rename to woob/tools/log.py index 14c4ae9e72d3ef505c24eae1fa66c15fc34bb7d1..62ca775f14b88f368ff721ac4c8a92312c2c7bc5 100644 --- a/weboob/tools/log.py +++ b/woob/tools/log.py @@ -23,7 +23,7 @@ from collections import defaultdict from logging import addLevelName, Formatter, getLogger as _getLogger, LoggerAdapter -from weboob.tools.misc import to_unicode +from woob.tools.misc import to_unicode __all__ = ['getLogger', 'createColoredFormatter', 'settings'] diff --git a/weboob/tools/lrudict.py b/woob/tools/lrudict.py similarity index 100% rename from weboob/tools/lrudict.py rename to woob/tools/lrudict.py diff --git a/weboob/tools/misc.py b/woob/tools/misc.py similarity index 100% rename from weboob/tools/misc.py rename to woob/tools/misc.py diff --git a/weboob/tools/newsfeed.py b/woob/tools/newsfeed.py similarity index 100% rename from weboob/tools/newsfeed.py rename to woob/tools/newsfeed.py diff --git a/weboob/tools/path.py b/woob/tools/path.py similarity index 100% rename from weboob/tools/path.py rename to woob/tools/path.py diff --git a/weboob/tools/pdf.py b/woob/tools/pdf.py similarity index 100% rename from weboob/tools/pdf.py rename to woob/tools/pdf.py diff --git a/weboob/tools/regex_helper.py b/woob/tools/regex_helper.py similarity index 99% rename from weboob/tools/regex_helper.py rename to woob/tools/regex_helper.py index e70e6d35d0e0e7ae9ba0a7882dd54229d12d59a0..4db9b2e72720b78687b1b8785ac8b8a7cb0846a7 100644 --- a/weboob/tools/regex_helper.py +++ b/woob/tools/regex_helper.py @@ -34,7 +34,7 @@ should be good enough for a large class of URLS, however. """ -from weboob.tools.compat import basestring +from woob.tools.compat import basestring # Mapping of an escape character to a representative of that class. So, e.g., # "\w" is replaced by "x" in a reverse URL. A value of None means to ignore diff --git a/weboob/tools/storage.py b/woob/tools/storage.py similarity index 100% rename from weboob/tools/storage.py rename to woob/tools/storage.py diff --git a/weboob/tools/test.py b/woob/tools/test.py similarity index 98% rename from weboob/tools/test.py rename to woob/tools/test.py index 0b2bb5315e08a2b118f458d58e02246ef073a3f6..3b493ebe20eadcaa4d7e28d91c34b187f3ee10ae 100644 --- a/weboob/tools/test.py +++ b/woob/tools/test.py @@ -22,8 +22,8 @@ from functools import wraps from unittest import TestCase -from weboob.capabilities.base import empty -from weboob.core import Woob +from woob.capabilities.base import empty +from woob.core import Woob # This is what nose does for Python 2.6 and lower compatibility # We do the same so nose becomes optional diff --git a/weboob/tools/tokenizer.py b/woob/tools/tokenizer.py similarity index 100% rename from weboob/tools/tokenizer.py rename to woob/tools/tokenizer.py diff --git a/weboob/tools/value.py b/woob/tools/value.py similarity index 99% rename from weboob/tools/value.py rename to woob/tools/value.py index bb486bd3fbb5d4a8281e54acf4f7440ef6f9b32a..32b85c57abfab5441f774857976ac36eb7ad3133 100644 --- a/weboob/tools/value.py +++ b/woob/tools/value.py @@ -22,7 +22,7 @@ import datetime from collections import OrderedDict -from weboob.tools.compat import unicode, basestring +from woob.tools.compat import unicode, basestring from .misc import to_unicode