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

rename CapBaseObject to BaseObject (refs #1424)

Browse source
This commit is contained in:
Romain Bignon 2014-07-05 17:26:05 +02:00
commit 51958135cb
44 changed files with 183 additions and 183 deletions
Download patch file Download diff file Expand all files Collapse all files

10
weboob/tools/application/formatters/iformatter.py
View file

@ -60,7 +60,7 @@ else:
finally:
termios.tcsetattr(fd, termios.TCSADRAIN, old_settings)
from weboob.capabilities.base import CapBaseObject
from weboob.capabilities.base import BaseObject
from weboob.tools.application.console import ConsoleApplication
from weboob.tools.ordereddict import OrderedDict
@ -139,13 +139,13 @@ class IFormatter(object):
An object has fields which can be selected.
:param obj: object to format
:type obj: CapBaseObject or dict
:type obj: BaseObject or dict
:param selected_fields: fields to display. If None, all fields are selected
:type selected_fields: tuple
:param alias: an alias to use instead of the object's ID
:type alias: unicode
"""
if isinstance(obj, CapBaseObject):
if isinstance(obj, BaseObject):
if selected_fields: # can be an empty list (nothing to do), or None (return all fields)
obj = obj.copy()
for name, value in obj.iter_fields():
@ -162,7 +162,7 @@ class IFormatter(object):
try:
obj = OrderedDict(obj)
except ValueError:
raise TypeError('Please give a CapBaseObject or a dict')
raise TypeError('Please give a BaseObject or a dict')
if selected_fields:
obj = obj.copy()
@ -188,7 +188,7 @@ class IFormatter(object):
This method has to be overridden in child classes.
:param obj: object to format
:type obj: CapBaseObject
:type obj: BaseObject
:rtype: str
"""
return self.format_dict(obj.to_dict())