From e5d40470162a55b42b5665620a757ee7d45fa9a8 Mon Sep 17 00:00:00 2001 From: Laurent Bachelier Date: Fri, 12 Nov 2010 18:52:50 +0100 Subject: [PATCH] Use basestring instead of str and unicode --- weboob/backends/bnporc/browser.py | 2 +- weboob/backends/cragr/browser.py | 2 +- weboob/backends/lcl/browser.py | 2 +- weboob/tools/config/iniconfig.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/weboob/backends/bnporc/browser.py b/weboob/backends/bnporc/browser.py index 312aa796..41d723d7 100644 --- a/weboob/backends/bnporc/browser.py +++ b/weboob/backends/bnporc/browser.py @@ -104,7 +104,7 @@ class BNPorc(BaseBrowser): return self.page.get_list() def get_account(self, id): - assert isinstance(id, (str, unicode)) + assert isinstance(id, basestring) if not self.is_on_page(pages.AccountsList): self.location('/NSFR?Action=DSP_VGLOBALE') diff --git a/weboob/backends/cragr/browser.py b/weboob/backends/cragr/browser.py index 44cce587..d8df7650 100644 --- a/weboob/backends/cragr/browser.py +++ b/weboob/backends/cragr/browser.py @@ -70,7 +70,7 @@ class Cragr(BaseBrowser): return self.page.get_list() def get_account(self, id): - assert isinstance(id, (str, unicode)) + assert isinstance(id, basestring) l = self.get_accounts_list() for a in l: diff --git a/weboob/backends/lcl/browser.py b/weboob/backends/lcl/browser.py index 073c6147..db3f9579 100644 --- a/weboob/backends/lcl/browser.py +++ b/weboob/backends/lcl/browser.py @@ -61,7 +61,7 @@ class LCLBrowser(BaseBrowser): return self.page.get_list() def get_account(self, id): - assert isinstance(id, (str, unicode)) + assert isinstance(id, basestring) l = self.get_accounts_list() for a in l: diff --git a/weboob/tools/config/iniconfig.py b/weboob/tools/config/iniconfig.py index 616ccc5a..b65b9433 100644 --- a/weboob/tools/config/iniconfig.py +++ b/weboob/tools/config/iniconfig.py @@ -62,7 +62,7 @@ class INIConfig(IConfig): def save(self): def save_section(values, root_section=None): for k, v in values.iteritems(): - if isinstance(v, (int, float, str, unicode)): + if isinstance(v, (int, float, basestring)): if root_section is not None and not self.config.has_section(root_section): self.config.add_section(root_section) self.config.set(root_section, k, unicode(v))