From 84e4e9a3eeb910ccad7e0bb83fc951d726e2f5f0 Mon Sep 17 00:00:00 2001
From: Vincent A <dev@indigo.re>
Date: Thu, 23 Feb 2017 00:03:09 +0100
Subject: [PATCH] use weboob.tools.compat.basestring and unicode where needed

---
 weboob/applications/boobsize/boobsize.py             | 1 +
 weboob/applications/boobtracker/boobtracker.py       | 1 +
 weboob/applications/monboob/monboob.py               | 1 +
 weboob/applications/qcineoob/main_window.py          | 1 +
 weboob/applications/qcineoob/movie.py                | 1 +
 weboob/applications/qcineoob/torrent.py              | 1 +
 weboob/applications/qhavedate/contacts.py            | 2 +-
 weboob/applications/qvideoob/minivideo.py            | 1 +
 weboob/applications/qvideoob/video.py                | 1 +
 weboob/applications/webcontentedit/webcontentedit.py | 1 +
 weboob/browser/browsers.py                           | 1 +
 weboob/browser/elements.py                           | 1 +
 weboob/browser/filters/html.py                       | 1 +
 weboob/browser/filters/json.py                       | 1 +
 weboob/browser/filters/standard.py                   | 2 +-
 weboob/browser/pages.py                              | 2 +-
 weboob/browser/url.py                                | 1 +
 weboob/capabilities/audio.py                         | 2 ++
 weboob/capabilities/bank.py                          | 1 +
 weboob/capabilities/bugtracker.py                    | 1 +
 weboob/capabilities/contact.py                       | 2 ++
 weboob/capabilities/gallery.py                       | 1 +
 weboob/capabilities/messages.py                      | 2 ++
 weboob/capabilities/paste.py                         | 1 +
 weboob/capabilities/weather.py                       | 2 ++
 weboob/core/backendscfg.py                           | 3 +++
 weboob/core/bcall.py                                 | 1 +
 weboob/core/modules.py                               | 1 +
 weboob/core/ouiboube.py                              | 1 +
 weboob/core/repositories.py                          | 1 +
 weboob/deprecated/browser/browser.py                 | 1 +
 weboob/deprecated/browser/parsers/csvparser.py       | 1 +
 weboob/tools/application/console.py                  | 1 +
 weboob/tools/application/formatters/csv.py           | 2 ++
 weboob/tools/application/formatters/iformatter.py    | 1 +
 weboob/tools/application/qt5/backendcfg.py           | 1 +
 weboob/tools/application/qt5/qt.py                   | 2 +-
 weboob/tools/application/repl.py                     | 2 +-
 weboob/tools/application/results.py                  | 1 +
 weboob/tools/backend.py                              | 1 +
 weboob/tools/capabilities/bank/iban.py               | 2 ++
 weboob/tools/captcha/virtkeyboard.py                 | 2 ++
 weboob/tools/config/iniconfig.py                     | 2 ++
 weboob/tools/html.py                                 | 2 ++
 weboob/tools/json.py                                 | 1 +
 weboob/tools/path.py                                 | 2 ++
 weboob/tools/regex_helper.py                         | 2 ++
 weboob/tools/value.py                                | 2 ++
 48 files changed, 62 insertions(+), 5 deletions(-)

diff --git a/weboob/applications/boobsize/boobsize.py b/weboob/applications/boobsize/boobsize.py
index b6ee67d835..492c3cc6f1 100644
--- a/weboob/applications/boobsize/boobsize.py
+++ b/weboob/applications/boobsize/boobsize.py
@@ -23,6 +23,7 @@
 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
 
 
 __all__ = ['Boobsize']
diff --git a/weboob/applications/boobtracker/boobtracker.py b/weboob/applications/boobtracker/boobtracker.py
index ad6635b0d5..c23da01b26 100644
--- a/weboob/applications/boobtracker/boobtracker.py
+++ b/weboob/applications/boobtracker/boobtracker.py
@@ -32,6 +32,7 @@
 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
 
diff --git a/weboob/applications/monboob/monboob.py b/weboob/applications/monboob/monboob.py
index 1f7621c3ad..c06bc8a860 100644
--- a/weboob/applications/monboob/monboob.py
+++ b/weboob/applications/monboob/monboob.py
@@ -36,6 +36,7 @@
 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
diff --git a/weboob/applications/qcineoob/main_window.py b/weboob/applications/qcineoob/main_window.py
index ac88e95457..cdffd59fe1 100644
--- a/weboob/applications/qcineoob/main_window.py
+++ b/weboob/applications/qcineoob/main_window.py
@@ -31,6 +31,7 @@
 from weboob.tools.application.qt5.backendcfg import BackendCfg
 from weboob.tools.application.qt5.models import BackendListModel
 from weboob.tools.application.qt5.search_history import HistoryCompleter
+from weboob.tools.compat import unicode
 
 from weboob.applications.suboob.suboob import LANGUAGE_CONV
 from weboob.applications.qcineoob.ui.main_window_ui import Ui_MainWindow
diff --git a/weboob/applications/qcineoob/movie.py b/weboob/applications/qcineoob/movie.py
index 67c3214c3b..fc98c59c6e 100644
--- a/weboob/applications/qcineoob/movie.py
+++ b/weboob/applications/qcineoob/movie.py
@@ -26,6 +26,7 @@
 from weboob.applications.qcineoob.ui.movie_ui import Ui_Movie
 from weboob.capabilities.base import empty
 from weboob.applications.suboob.suboob import LANGUAGE_CONV
+from weboob.tools.compat import unicode
 
 
 class Movie(QFrame):
diff --git a/weboob/applications/qcineoob/torrent.py b/weboob/applications/qcineoob/torrent.py
index 21fd3bc033..adf4809bed 100644
--- a/weboob/applications/qcineoob/torrent.py
+++ b/weboob/applications/qcineoob/torrent.py
@@ -25,6 +25,7 @@
 from weboob.applications.qcineoob.ui.torrent_ui import Ui_Torrent
 from weboob.applications.weboorrents.weboorrents import sizeof_fmt
 from weboob.capabilities.base import empty
+from weboob.tools.compat import unicode
 
 
 class Torrent(QFrame):
diff --git a/weboob/applications/qhavedate/contacts.py b/weboob/applications/qhavedate/contacts.py
index 05dbe47bc4..a5a2b6311d 100644
--- a/weboob/applications/qhavedate/contacts.py
+++ b/weboob/applications/qhavedate/contacts.py
@@ -27,7 +27,7 @@
 
 from weboob.tools.application.qt5 import QtDo, HTMLDelegate
 from weboob.tools.application.qt5.models import BackendListModel
-from weboob.tools.compat import range
+from weboob.tools.compat import range, basestring, unicode
 from weboob.tools.misc import to_unicode
 from weboob.capabilities.contact import CapContact, Contact
 from weboob.capabilities.chat import CapChat
diff --git a/weboob/applications/qvideoob/minivideo.py b/weboob/applications/qvideoob/minivideo.py
index 10207778b9..3060ca1d09 100644
--- a/weboob/applications/qvideoob/minivideo.py
+++ b/weboob/applications/qvideoob/minivideo.py
@@ -22,6 +22,7 @@
 from PyQt5.QtWidgets import QFrame
 
 from weboob.tools.application.qt5 import QtDo
+from weboob.tools.compat import unicode
 from weboob.applications.qvideoob.ui.minivideo_ui import Ui_MiniVideo
 from .video import Video
 
diff --git a/weboob/applications/qvideoob/video.py b/weboob/applications/qvideoob/video.py
index 465dce6cd1..15e4b52980 100644
--- a/weboob/applications/qvideoob/video.py
+++ b/weboob/applications/qvideoob/video.py
@@ -23,6 +23,7 @@
 from PyQt5.QtMultimedia import QMediaContent, QMediaPlayer
 
 from weboob.applications.qvideoob.ui.video_ui import Ui_Video
+from weboob.tools.compat import unicode
 
 
 class Video(QDialog):
diff --git a/weboob/applications/webcontentedit/webcontentedit.py b/weboob/applications/webcontentedit/webcontentedit.py
index 78b04ce598..d2e8214d7b 100644
--- a/weboob/applications/webcontentedit/webcontentedit.py
+++ b/weboob/applications/webcontentedit/webcontentedit.py
@@ -27,6 +27,7 @@
 from weboob.core.bcall import CallErrors
 from weboob.capabilities.content import CapContent, Revision
 from weboob.tools.application.repl import ReplApplication, defaultcount
+from weboob.tools.compat import unicode
 
 
 __all__ = ['WebContentEdit']
diff --git a/weboob/browser/browsers.py b/weboob/browser/browsers.py
index 3f83687ff3..47384dd9e8 100644
--- a/weboob/browser/browsers.py
+++ b/weboob/browser/browsers.py
@@ -51,6 +51,7 @@
 from weboob.exceptions import BrowserHTTPSDowngrade, ModuleInstallError
 
 from weboob.tools.log import getLogger
+from weboob.tools.compat import basestring, unicode
 from weboob.tools.json import json
 
 from .cookies import WeboobCookieJar
diff --git a/weboob/browser/elements.py b/weboob/browser/elements.py
index 71111b3a02..06d583be85 100644
--- a/weboob/browser/elements.py
+++ b/weboob/browser/elements.py
@@ -28,6 +28,7 @@
 import lxml.html
 
 from weboob.tools.log import getLogger, DEBUG_FILTERS
+from weboob.tools.compat import basestring, unicode
 from weboob.browser.pages import NextPage
 
 from .filters.standard import _Filter, CleanText
diff --git a/weboob/browser/filters/html.py b/weboob/browser/filters/html.py
index 051709ac74..18c75ef195 100644
--- a/weboob/browser/filters/html.py
+++ b/weboob/browser/filters/html.py
@@ -21,6 +21,7 @@
 import lxml.html as html
 from .standard import _Selector, _NO_DEFAULT, Filter, FilterError
 from weboob.tools.html import html2text
+from weboob.tools.compat import basestring, unicode
 
 
 __all__ = ['CSS', 'XPath', 'XPathNotFound', 'AttributeNotFound',
diff --git a/weboob/browser/filters/json.py b/weboob/browser/filters/json.py
index d9b9221a34..fc12b78494 100644
--- a/weboob/browser/filters/json.py
+++ b/weboob/browser/filters/json.py
@@ -17,6 +17,7 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with weboob. If not, see <http://www.gnu.org/licenses/>.
 
+from weboob.tools.compat import basestring
 
 from .standard import _Filter, _NO_DEFAULT, Filter, ParseError
 
diff --git a/weboob/browser/filters/standard.py b/weboob/browser/filters/standard.py
index 49724cb32c..a7c6f5bdcd 100644
--- a/weboob/browser/filters/standard.py
+++ b/weboob/browser/filters/standard.py
@@ -32,7 +32,7 @@
 
 from weboob.capabilities.base import empty
 from weboob.capabilities.base import Currency as BaseCurrency
-from weboob.tools.compat import basestring
+from weboob.tools.compat import basestring, unicode
 from weboob.exceptions import ParseError
 from weboob.browser.url import URL
 from weboob.tools.log import getLogger, DEBUG_FILTERS
diff --git a/weboob/browser/pages.py b/weboob/browser/pages.py
index 9a4129aadb..2b8557072c 100644
--- a/weboob/browser/pages.py
+++ b/weboob/browser/pages.py
@@ -34,7 +34,7 @@
 import requests
 
 from weboob.exceptions import ParseError, ModuleInstallError
-from weboob.tools.compat import basestring
+from weboob.tools.compat import basestring, unicode
 from weboob.tools.log import getLogger
 from weboob.tools.pdf import decompress_pdf
 
diff --git a/weboob/browser/url.py b/weboob/browser/url.py
index 3d787c91e7..9745bf1d61 100644
--- a/weboob/browser/url.py
+++ b/weboob/browser/url.py
@@ -25,6 +25,7 @@
 import re
 import requests
 
+from weboob.tools.compat import basestring
 from weboob.tools.regex_helper import normalize
 from weboob.tools.misc import to_unicode
 
diff --git a/weboob/capabilities/audio.py b/weboob/capabilities/audio.py
index 70fef112ab..1a0d52934d 100644
--- a/weboob/capabilities/audio.py
+++ b/weboob/capabilities/audio.py
@@ -19,6 +19,8 @@
 
 import re
 
+from weboob.tools.compat import unicode
+
 from .image import Thumbnail
 from .base import Field, StringField, IntField, BaseObject
 from .date import DeltaField
diff --git a/weboob/capabilities/bank.py b/weboob/capabilities/bank.py
index 5ad831c12f..550a1e59dd 100644
--- a/weboob/capabilities/bank.py
+++ b/weboob/capabilities/bank.py
@@ -25,6 +25,7 @@
 from weboob.capabilities.base import empty
 from weboob.exceptions import BrowserQuestion
 from weboob.tools.capabilities.bank.iban import is_iban_valid
+from weboob.tools.compat import unicode
 
 from .base import BaseObject, Field, StringField, DecimalField, IntField, \
                   UserError, Currency, NotAvailable
diff --git a/weboob/capabilities/bugtracker.py b/weboob/capabilities/bugtracker.py
index f2350117e0..b57fa2de4f 100644
--- a/weboob/capabilities/bugtracker.py
+++ b/weboob/capabilities/bugtracker.py
@@ -17,6 +17,7 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with weboob. If not, see <http://www.gnu.org/licenses/>.
 
+from weboob.tools.compat import unicode
 
 from .base import Capability, BaseObject, Field, StringField,\
                   IntField, UserError
diff --git a/weboob/capabilities/contact.py b/weboob/capabilities/contact.py
index af704f19f0..e327da51dd 100644
--- a/weboob/capabilities/contact.py
+++ b/weboob/capabilities/contact.py
@@ -19,6 +19,8 @@
 
 from collections import OrderedDict
 
+from weboob.tools.compat import unicode
+
 from .base import Capability, BaseObject, Field, StringField, BytesField, IntField, \
                   BoolField, UserError
 
diff --git a/weboob/capabilities/gallery.py b/weboob/capabilities/gallery.py
index 9f4850b05e..9c67e551a7 100644
--- a/weboob/capabilities/gallery.py
+++ b/weboob/capabilities/gallery.py
@@ -19,6 +19,7 @@
 
 
 from weboob.capabilities.image import BaseImage as CIBaseImage, Thumbnail
+from weboob.tools.compat import unicode
 from .base import Capability, BaseObject, NotLoaded, Field, StringField, \
                   IntField, FloatField
 from .date import DateField
diff --git a/weboob/capabilities/messages.py b/weboob/capabilities/messages.py
index 1e7989d416..dbab953865 100644
--- a/weboob/capabilities/messages.py
+++ b/weboob/capabilities/messages.py
@@ -21,6 +21,8 @@
 import datetime
 import time
 
+from weboob.tools.compat import unicode
+
 from .base import Capability, BaseObject, NotLoaded, Field, StringField, \
                   IntField, UserError
 from .date import DateField
diff --git a/weboob/capabilities/paste.py b/weboob/capabilities/paste.py
index e2b802af9e..157149d0eb 100644
--- a/weboob/capabilities/paste.py
+++ b/weboob/capabilities/paste.py
@@ -17,6 +17,7 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with weboob. If not, see <http://www.gnu.org/licenses/>.
 
+from weboob.tools.compat import unicode
 
 from .base import Capability, BaseObject, NotLoaded, StringField, BoolField, UserError
 
diff --git a/weboob/capabilities/weather.py b/weboob/capabilities/weather.py
index 080330fec6..c2fbc6a8c5 100644
--- a/weboob/capabilities/weather.py
+++ b/weboob/capabilities/weather.py
@@ -20,6 +20,8 @@
 
 from datetime import datetime, date
 
+from weboob.tools.compat import basestring, unicode
+
 from .base import Capability, BaseObject, Field, FloatField, \
                   StringField, UserError, NotLoaded
 from .date import DateField
diff --git a/weboob/core/backendscfg.py b/weboob/core/backendscfg.py
index 63b4af7140..36dc2f67ad 100644
--- a/weboob/core/backendscfg.py
+++ b/weboob/core/backendscfg.py
@@ -27,6 +27,9 @@
     from configparser import RawConfigParser, DuplicateSectionError
 from logging import warning
 
+from weboob.tools.compat import unicode
+
+
 __all__ = ['BackendsConfig', 'BackendAlreadyExists']
 
 
diff --git a/weboob/core/bcall.py b/weboob/core/bcall.py
index f3b1dc9386..b0d35842fb 100644
--- a/weboob/core/bcall.py
+++ b/weboob/core/bcall.py
@@ -26,6 +26,7 @@
     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
 
diff --git a/weboob/core/modules.py b/weboob/core/modules.py
index 78576e4663..6558fba23e 100644
--- a/weboob/core/modules.py
+++ b/weboob/core/modules.py
@@ -22,6 +22,7 @@
 import logging
 
 from weboob.tools.backend import Module
+from weboob.tools.compat import basestring
 from weboob.tools.log import getLogger
 from weboob.exceptions import ModuleLoadError
 
diff --git a/weboob/core/ouiboube.py b/weboob/core/ouiboube.py
index 5f32c9791a..f4fbcd38b2 100644
--- a/weboob/core/ouiboube.py
+++ b/weboob/core/ouiboube.py
@@ -27,6 +27,7 @@
 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
diff --git a/weboob/core/repositories.py b/weboob/core/repositories.py
index b2021f6268..c3899d8b31 100644
--- a/weboob/core/repositories.py
+++ b/weboob/core/repositories.py
@@ -36,6 +36,7 @@
 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
 try:
     from ConfigParser import RawConfigParser, DEFAULTSECT
 except ImportError:
diff --git a/weboob/deprecated/browser/browser.py b/weboob/deprecated/browser/browser.py
index 3c7f3bc796..92241810a9 100644
--- a/weboob/deprecated/browser/browser.py
+++ b/weboob/deprecated/browser/browser.py
@@ -53,6 +53,7 @@
 from threading import RLock
 
 from weboob.exceptions import BrowserUnavailable, BrowserIncorrectPassword, BrowserPasswordExpired, BrowserForbidden, BrowserBanned, BrowserHTTPNotFound, BrowserHTTPError, FormFieldConversionWarning, BrowserSSLError
+from weboob.tools.compat import basestring, unicode
 from weboob.tools.decorators import retry
 from weboob.tools.log import getLogger
 from weboob.deprecated.browser.parsers import get_parser
diff --git a/weboob/deprecated/browser/parsers/csvparser.py b/weboob/deprecated/browser/parsers/csvparser.py
index 1ac07f535e..de7b1bb044 100644
--- a/weboob/deprecated/browser/parsers/csvparser.py
+++ b/weboob/deprecated/browser/parsers/csvparser.py
@@ -21,6 +21,7 @@
 import csv
 
 from weboob.tools.log import getLogger
+from weboob.tools.compat import basestring, unicode
 from .iparser import IParser
 
 
diff --git a/weboob/tools/application/console.py b/weboob/tools/application/console.py
index 6331183717..7749a953e2 100644
--- a/weboob/tools/application/console.py
+++ b/weboob/tools/application/console.py
@@ -41,6 +41,7 @@
                                      TransferInvalidEmitter, TransferInvalidRecipient
 from weboob.tools.value import Value, ValueBool, ValueFloat, ValueInt, ValueBackendPassword
 from weboob.tools.misc import to_unicode
+from weboob.tools.compat import unicode
 
 from .base import Application, MoreResultsAvailable
 
diff --git a/weboob/tools/application/formatters/csv.py b/weboob/tools/application/formatters/csv.py
index fb5bf777ef..83395e7683 100644
--- a/weboob/tools/application/formatters/csv.py
+++ b/weboob/tools/application/formatters/csv.py
@@ -20,6 +20,8 @@
 from __future__ import absolute_import
 import csv
 
+from weboob.tools.compat import basestring, unicode
+
 from .iformatter import IFormatter
 
 __all__ = ['CSVFormatter']
diff --git a/weboob/tools/application/formatters/iformatter.py b/weboob/tools/application/formatters/iformatter.py
index 658ee28581..7e29dc4feb 100644
--- a/weboob/tools/application/formatters/iformatter.py
+++ b/weboob/tools/application/formatters/iformatter.py
@@ -62,6 +62,7 @@ def readch():
 
 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
 
 __all__ = ['IFormatter', 'MandatoryFieldsNotFound']
diff --git a/weboob/tools/application/qt5/backendcfg.py b/weboob/tools/application/qt5/backendcfg.py
index b8ef49729d..cd3f2346bb 100644
--- a/weboob/tools/application/qt5/backendcfg.py
+++ b/weboob/tools/application/qt5/backendcfg.py
@@ -38,6 +38,7 @@
 from .backendcfg_ui import Ui_BackendCfg
 from .reposdlg_ui import Ui_RepositoriesDlg
 from weboob.tools.misc import to_unicode
+from weboob.tools.compat import unicode
 from .qt import QtValue
 
 
diff --git a/weboob/tools/application/qt5/qt.py b/weboob/tools/application/qt5/qt.py
index 69797e009e..3e6f414e4c 100644
--- a/weboob/tools/application/qt5/qt.py
+++ b/weboob/tools/application/qt5/qt.py
@@ -36,7 +36,7 @@
 
 from weboob.core.ouiboube import Weboob, VersionsMismatchError
 from weboob.core.scheduler import IScheduler
-from weboob.tools.compat import range
+from weboob.tools.compat import range, unicode
 from weboob.tools.config.iconfig import ConfigError
 from weboob.exceptions import BrowserUnavailable, BrowserIncorrectPassword, BrowserForbidden, ModuleInstallError
 from weboob.tools.value import ValueInt, ValueBool, ValueBackendPassword
diff --git a/weboob/tools/application/repl.py b/weboob/tools/application/repl.py
index d5c938dd7a..e6369aaa84 100644
--- a/weboob/tools/application/repl.py
+++ b/weboob/tools/application/repl.py
@@ -31,7 +31,7 @@
 from weboob.capabilities.base import FieldNotFound, BaseObject, UserError
 from weboob.core import CallErrors
 from weboob.tools.application.formatters.iformatter import MandatoryFieldsNotFound
-from weboob.tools.compat import range
+from weboob.tools.compat import range, basestring, unicode
 from weboob.tools.misc import to_unicode
 from weboob.tools.path import WorkingPath
 from weboob.capabilities.collection import Collection, BaseCollection, CapCollection, CollectionNotFound
diff --git a/weboob/tools/application/results.py b/weboob/tools/application/results.py
index d6565642c8..a4f9fe3c6b 100644
--- a/weboob/tools/application/results.py
+++ b/weboob/tools/application/results.py
@@ -18,6 +18,7 @@
 # along with weboob. If not, see <http://www.gnu.org/licenses/>.
 
 from weboob.capabilities import UserError
+from weboob.tools.compat import unicode
 
 
 __all__ = ['ResultsCondition', 'ResultsConditionError']
diff --git a/weboob/tools/backend.py b/weboob/tools/backend.py
index 54159428ea..a05291be8c 100644
--- a/weboob/tools/backend.py
+++ b/weboob/tools/backend.py
@@ -24,6 +24,7 @@
 from weboob.capabilities.base import BaseObject, FieldNotFound, \
     Capability, NotLoaded, NotAvailable
 from weboob.tools.misc import iter_fields
+from weboob.tools.compat import basestring
 from weboob.tools.log import getLogger
 from weboob.tools.value import ValuesDict
 from weboob.exceptions import ModuleInstallError
diff --git a/weboob/tools/capabilities/bank/iban.py b/weboob/tools/capabilities/bank/iban.py
index 1b6a5c8651..ff7d3850dd 100644
--- a/weboob/tools/capabilities/bank/iban.py
+++ b/weboob/tools/capabilities/bank/iban.py
@@ -20,6 +20,8 @@
 
 import re
 
+from weboob.tools.compat import unicode
+
 _country2length = dict(
     AL=28, AD=24, AT=20, AZ=28, BE=16, BH=22, BA=20, BR=29,
     BG=22, CR=21, HR=21, CY=28, CZ=24, DK=18, DO=28, EE=20,
diff --git a/weboob/tools/captcha/virtkeyboard.py b/weboob/tools/captcha/virtkeyboard.py
index 61cc74bd01..779dec8f68 100644
--- a/weboob/tools/captcha/virtkeyboard.py
+++ b/weboob/tools/captcha/virtkeyboard.py
@@ -26,6 +26,8 @@
 except ImportError:
     raise ImportError('Please install python-imaging')
 
+from weboob.tools.compat import basestring
+
 
 class VirtKeyboardError(Exception):
     pass
diff --git a/weboob/tools/config/iniconfig.py b/weboob/tools/config/iniconfig.py
index 34d5bad6d8..c26d910954 100644
--- a/weboob/tools/config/iniconfig.py
+++ b/weboob/tools/config/iniconfig.py
@@ -28,6 +28,8 @@
 import logging
 import os
 
+from weboob.tools.compat import basestring, unicode
+
 from .iconfig import IConfig
 
 
diff --git a/weboob/tools/html.py b/weboob/tools/html.py
index 53c039c726..774b3d9f85 100644
--- a/weboob/tools/html.py
+++ b/weboob/tools/html.py
@@ -19,6 +19,8 @@
 
 import warnings
 
+from weboob.tools.compat import unicode
+
 __all__ = ['html2text']
 
 
diff --git a/weboob/tools/json.py b/weboob/tools/json.py
index 615d81f325..811c3ba5f0 100644
--- a/weboob/tools/json.py
+++ b/weboob/tools/json.py
@@ -36,6 +36,7 @@
     import json
 
 from weboob.capabilities.base import BaseObject, NotAvailable, NotLoaded
+from weboob.tools.compat import basestring
 
 
 def mini_jsonpath(node, path):
diff --git a/weboob/tools/path.py b/weboob/tools/path.py
index aa07ade3ec..abb88f0ce6 100644
--- a/weboob/tools/path.py
+++ b/weboob/tools/path.py
@@ -19,6 +19,8 @@
 from copy import copy
 from posixpath import sep, join
 
+from .compat import unicode
+
 
 class WorkingPath(object):
     def __init__(self):
diff --git a/weboob/tools/regex_helper.py b/weboob/tools/regex_helper.py
index a102534691..5bb39c5e94 100644
--- a/weboob/tools/regex_helper.py
+++ b/weboob/tools/regex_helper.py
@@ -34,6 +34,8 @@
 should be good enough for a large class of URLS, however.
 """
 
+from weboob.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
 # this sequence. Any missing key is mapped to itself.
diff --git a/weboob/tools/value.py b/weboob/tools/value.py
index 6a93e3825b..1dbcbe4331 100644
--- a/weboob/tools/value.py
+++ b/weboob/tools/value.py
@@ -25,6 +25,8 @@
 from collections import OrderedDict
 from subprocess import check_output
 
+from weboob.tools.compat import basestring, unicode
+
 from .misc import to_unicode
 
 
-- 
GitLab