nojhan/weboob-devel
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

compare instance to basestring instead of (str, unicode)

Browse source
This commit is contained in:
Christophe Benz 2010-08-17 19:33:06 +02:00
commit 8afff42465
9 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
weboob/core/backends.py
View file

@ -85,7 +85,7 @@ class Backend(object):
def has_caps(self, *caps):
for c in caps:
if (isinstance(c, (unicode,str)) and c in [cap.__name__ for cap in self.iter_caps()]) or \
if (isinstance(c, basestring) and c in [cap.__name__ for cap in self.iter_caps()]) or \
(type(c) == type and issubclass(self.klass, c)):
return True
return False

2
weboob/core/bcall.py
View file

@ -103,7 +103,7 @@ class BackendsCall(object):
else:
debug('%s: Called function %s returned: %r' % (backend, function, result))
if hasattr(result, '__iter__') and not isinstance(result, (str,unicode)):
if hasattr(result, '__iter__') and not isinstance(result, basestring):
# Loop on iterator
try:
for subresult in result:

6
weboob/core/ouiboube.py
View file

@ -110,7 +110,7 @@ class Weboob(object):
return loaded
def unload_backends(self, names=None):
if isinstance(names, (str,unicode)):
if isinstance(names, basestring):
names = [names]
elif names is None:
names = self.backend_instances.keys()
@ -159,12 +159,12 @@ class Weboob(object):
if _backends:
if isinstance(_backends, BaseBackend):
backends = [_backends]
elif isinstance(_backends, (str,unicode)) and _backends:
elif isinstance(_backends, basestring) and _backends:
backends = [self.backend_instances[_backends]]
elif isinstance(_backends, (list,tuple)):
backends = []
for backend in _backends:
if isinstance(backend, (str,unicode)):
if isinstance(backend, basestring):
try:
backends.append(self.backend_instances[backend])
except ValueError: