From 44dffce7b2c967fac05f67b290a095e9318f57ba Mon Sep 17 00:00:00 2001 From: Florent Date: Tue, 23 Sep 2014 10:20:09 +0200 Subject: [PATCH] Rename CapBase to Capability --- docs/source/guides/module.rst | 2 +- weboob/capabilities/__init__.py | 4 ++-- weboob/capabilities/account.py | 4 ++-- weboob/capabilities/base.py | 4 ++-- weboob/capabilities/bugtracker.py | 4 ++-- weboob/capabilities/chat.py | 4 ++-- weboob/capabilities/cinema.py | 4 ++-- weboob/capabilities/collection.py | 4 ++-- weboob/capabilities/contact.py | 4 ++-- weboob/capabilities/content.py | 4 ++-- weboob/capabilities/dating.py | 4 ++-- weboob/capabilities/file.py | 4 ++-- weboob/capabilities/gallery.py | 4 ++-- weboob/capabilities/gauge.py | 4 ++-- weboob/capabilities/geolocip.py | 4 ++-- weboob/capabilities/housing.py | 4 ++-- weboob/capabilities/job.py | 4 ++-- weboob/capabilities/lyrics.py | 4 ++-- weboob/capabilities/messages.py | 6 +++--- weboob/capabilities/parcel.py | 4 ++-- weboob/capabilities/paste.py | 4 ++-- weboob/capabilities/pricecomparison.py | 4 ++-- weboob/capabilities/radio.py | 4 ++-- weboob/capabilities/recipe.py | 4 ++-- weboob/capabilities/subtitle.py | 4 ++-- weboob/capabilities/torrent.py | 4 ++-- weboob/capabilities/translate.py | 4 ++-- weboob/capabilities/travel.py | 4 ++-- weboob/capabilities/weather.py | 4 ++-- weboob/core/ouiboube.py | 6 +++--- weboob/tools/backend.py | 6 +++--- 31 files changed, 64 insertions(+), 64 deletions(-) diff --git a/docs/source/guides/module.rst b/docs/source/guides/module.rst index 87e9b3c6..adad6c5f 100644 --- a/docs/source/guides/module.rst +++ b/docs/source/guides/module.rst @@ -19,7 +19,7 @@ Select capabilities ******************* Each module implements one or many :doc:`capabilities ` to tell what kind of features the -website provides. A capability is a class derived from :class:`weboob.capabilities.base.CapBase` and with some abstract +website provides. A capability is a class derived from :class:`weboob.capabilities.base.Capability` and with some abstract methods (which raise ``NotImplementedError``). A capability needs to be as generic as possible to allow a maximum number of modules to implement it. diff --git a/weboob/capabilities/__init__.py b/weboob/capabilities/__init__.py index 85582911..1b844a22 100644 --- a/weboob/capabilities/__init__.py +++ b/weboob/capabilities/__init__.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -from .base import UserError, NotLoaded, NotAvailable, BaseObject, CapBase +from .base import UserError, NotLoaded, NotAvailable, BaseObject, Capability -__all__ = ['UserError', 'NotLoaded', 'NotAvailable', 'BaseObject', 'CapBase'] +__all__ = ['UserError', 'NotLoaded', 'NotAvailable', 'BaseObject', 'Capability'] diff --git a/weboob/capabilities/account.py b/weboob/capabilities/account.py index b814222a..0acd88da 100644 --- a/weboob/capabilities/account.py +++ b/weboob/capabilities/account.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . -from .base import CapBase, BaseObject, StringField, Field, UserError +from .base import Capability, BaseObject, StringField, Field, UserError __all__ = ['AccountRegisterError', 'Account', 'StatusField', 'CapAccount'] @@ -56,7 +56,7 @@ class StatusField(object): self.flags = flags -class CapAccount(CapBase): +class CapAccount(Capability): """ Capability for websites when you can create and manage accounts. diff --git a/weboob/capabilities/base.py b/weboob/capabilities/base.py index aa8c537b..92b04500 100644 --- a/weboob/capabilities/base.py +++ b/weboob/capabilities/base.py @@ -29,7 +29,7 @@ from weboob.tools.ordereddict import OrderedDict __all__ = ['UserError', 'FieldNotFound', 'NotAvailable', - 'NotLoaded', 'CapBase', 'Field', 'IntField', 'DecimalField', + 'NotLoaded', 'Capability', 'Field', 'IntField', 'DecimalField', 'FloatField', 'StringField', 'BytesField', 'empty', 'BaseObject'] @@ -152,7 +152,7 @@ class NotLoadedType(object): NotLoaded = NotLoadedType() -class CapBase(object): +class Capability(object): """ This is the base class for all capabilities. diff --git a/weboob/capabilities/bugtracker.py b/weboob/capabilities/bugtracker.py index 424afafa..99d78b68 100644 --- a/weboob/capabilities/bugtracker.py +++ b/weboob/capabilities/bugtracker.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . -from .base import CapBase, BaseObject, Field, StringField,\ +from .base import Capability, BaseObject, Field, StringField,\ IntField, UserError from .date import DateField, DeltaField @@ -232,7 +232,7 @@ class Query(BaseObject): BaseObject.__init__(self, '') -class CapBugTracker(CapBase): +class CapBugTracker(Capability): """ Bug trackers websites. """ diff --git a/weboob/capabilities/chat.py b/weboob/capabilities/chat.py index 3b0216c8..c2ee9d33 100644 --- a/weboob/capabilities/chat.py +++ b/weboob/capabilities/chat.py @@ -20,7 +20,7 @@ import datetime -from .base import CapBase, BaseObject, StringField, UserError +from .base import Capability, BaseObject, StringField, UserError from .date import DateField @@ -53,7 +53,7 @@ class ChatMessage(BaseObject): self.date = datetime.datetime.utcnow() -class CapChat(CapBase): +class CapChat(Capability): """ Websites with a chat system. """ diff --git a/weboob/capabilities/cinema.py b/weboob/capabilities/cinema.py index 4b83fe8c..4158097d 100644 --- a/weboob/capabilities/cinema.py +++ b/weboob/capabilities/cinema.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . -from .base import CapBase, BaseObject, StringField, IntField, Field +from .base import Capability, BaseObject, StringField, IntField, Field from .date import DateField @@ -69,7 +69,7 @@ class Person(BaseObject): self.name = name -class CapCinema(CapBase): +class CapCinema(Capability): """ Cinema databases. """ diff --git a/weboob/capabilities/collection.py b/weboob/capabilities/collection.py index c2ec4f53..4971c06f 100644 --- a/weboob/capabilities/collection.py +++ b/weboob/capabilities/collection.py @@ -19,7 +19,7 @@ from weboob.tools.ordereddict import OrderedDict -from .base import CapBase, BaseObject, UserError, StringField, Field +from .base import Capability, BaseObject, UserError, StringField, Field __all__ = ['CapCollection', 'BaseCollection', 'Collection', 'CollectionNotFound'] @@ -95,7 +95,7 @@ class Collection(BaseCollection): return u'Unknown collection' -class CapCollection(CapBase): +class CapCollection(Capability): def iter_resources_flat(self, objs, split_path, clean_only=False): """ Call iter_resources() to fetch all resources in the tree. diff --git a/weboob/capabilities/contact.py b/weboob/capabilities/contact.py index 0051b09f..17877b17 100644 --- a/weboob/capabilities/contact.py +++ b/weboob/capabilities/contact.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . -from .base import CapBase, BaseObject, Field, StringField, BytesField, IntField, \ +from .base import Capability, BaseObject, Field, StringField, BytesField, IntField, \ UserError from weboob.tools.ordereddict import OrderedDict @@ -165,7 +165,7 @@ class Query(BaseObject): self.message = message -class CapContact(CapBase): +class CapContact(Capability): def iter_contacts(self, status=Contact.STATUS_ALL, ids=None): """ Iter contacts diff --git a/weboob/capabilities/content.py b/weboob/capabilities/content.py index 0c3bf8d4..71886300 100644 --- a/weboob/capabilities/content.py +++ b/weboob/capabilities/content.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . -from .base import CapBase, BaseObject, StringField, Field +from .base import Capability, BaseObject, StringField, Field from .date import DateField @@ -45,7 +45,7 @@ class Revision(BaseObject): minor = Field('Is this change minor?', bool) -class CapContent(CapBase): +class CapContent(Capability): def get_content(self, id, revision=None): """ Get a content from an ID. diff --git a/weboob/capabilities/dating.py b/weboob/capabilities/dating.py index 2ef27ad7..24fe238c 100644 --- a/weboob/capabilities/dating.py +++ b/weboob/capabilities/dating.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . -from .base import CapBase, BaseObject, Field, StringField, UserError +from .base import Capability, BaseObject, Field, StringField, UserError from .date import DateField from .contact import Contact @@ -90,7 +90,7 @@ class Event(BaseObject): message = StringField('Message of the event') -class CapDating(CapBase): +class CapDating(Capability): """ Capability for dating websites. """ diff --git a/weboob/capabilities/file.py b/weboob/capabilities/file.py index bbc9f707..a256cfa4 100644 --- a/weboob/capabilities/file.py +++ b/weboob/capabilities/file.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . -from .base import CapBase, BaseObject, NotAvailable, Field, StringField +from .base import Capability, BaseObject, NotAvailable, Field, StringField from .date import DateField @@ -60,7 +60,7 @@ class BaseFile(BaseObject): return self.id2url(self.id) -class CapFile(CapBase): +class CapFile(Capability): """ Provide file download """ diff --git a/weboob/capabilities/gallery.py b/weboob/capabilities/gallery.py index 6098f422..634b0a53 100644 --- a/weboob/capabilities/gallery.py +++ b/weboob/capabilities/gallery.py @@ -19,7 +19,7 @@ from weboob.tools.capabilities.thumbnail import Thumbnail -from .base import CapBase, BaseObject, NotLoaded, Field, StringField, \ +from .base import Capability, BaseObject, NotLoaded, Field, StringField, \ BytesField, IntField, FloatField from .date import DateField @@ -104,7 +104,7 @@ class BaseImage(BaseObject): return self.data is not NotLoaded -class CapGallery(CapBase): +class CapGallery(Capability): """ This capability represents the ability for a website backend to provide videos. """ diff --git a/weboob/capabilities/gauge.py b/weboob/capabilities/gauge.py index ad7ef0ef..e0c27833 100644 --- a/weboob/capabilities/gauge.py +++ b/weboob/capabilities/gauge.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . -from .base import CapBase, BaseObject, StringField, FloatField, Field, UserError, empty +from .base import Capability, BaseObject, StringField, FloatField, Field, UserError, empty from .date import DateField __all__ = ['Gauge', 'GaugeSensor', 'GaugeMeasure', 'CapGauge', 'SensorNotFound'] @@ -74,7 +74,7 @@ class GaugeSensor(BaseObject): return "" % (self.id, self.name) -class CapGauge(CapBase): +class CapGauge(Capability): def iter_gauges(self, pattern=None): """ Iter gauges. diff --git a/weboob/capabilities/geolocip.py b/weboob/capabilities/geolocip.py index 04499c63..7fa4d392 100644 --- a/weboob/capabilities/geolocip.py +++ b/weboob/capabilities/geolocip.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . -from .base import CapBase, BaseObject, StringField, FloatField +from .base import Capability, BaseObject, StringField, FloatField __all__ = ['IpLocation', 'CapGeolocIp'] @@ -42,7 +42,7 @@ class IpLocation(BaseObject): BaseObject.__init__(self, ipaddr) -class CapGeolocIp(CapBase): +class CapGeolocIp(Capability): """ Access information about IP addresses database. """ diff --git a/weboob/capabilities/housing.py b/weboob/capabilities/housing.py index 41f8cd4f..8ab981e0 100644 --- a/weboob/capabilities/housing.py +++ b/weboob/capabilities/housing.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . -from .base import CapBase, BaseObject, Field, IntField, DecimalField, \ +from .base import Capability, BaseObject, Field, IntField, DecimalField, \ StringField, BytesField from .date import DateField @@ -105,7 +105,7 @@ class City(BaseObject): name = StringField('Name of city') -class CapHousing(CapBase): +class CapHousing(Capability): """ Capability of websites to search housings. """ diff --git a/weboob/capabilities/job.py b/weboob/capabilities/job.py index 94059ae0..f9be67d6 100644 --- a/weboob/capabilities/job.py +++ b/weboob/capabilities/job.py @@ -17,7 +17,7 @@ # You should have received a copy of the GNU Affero General Public License # along with weboob. If not, see . -from .base import BaseObject, CapBase, StringField +from .base import BaseObject, Capability, StringField from .date import DateField __all__ = ['BaseJobAdvert', 'CapJob'] @@ -68,7 +68,7 @@ class BaseJobAdvert(BaseObject): return self.id2url(self.id) -class CapJob(CapBase): +class CapJob(Capability): """ Capability of job annouce websites. """ diff --git a/weboob/capabilities/lyrics.py b/weboob/capabilities/lyrics.py index 7951227d..3b775231 100644 --- a/weboob/capabilities/lyrics.py +++ b/weboob/capabilities/lyrics.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . -from .base import CapBase, BaseObject, StringField +from .base import Capability, BaseObject, StringField __all__ = ['SongLyrics', 'CapLyrics'] @@ -37,7 +37,7 @@ class SongLyrics(BaseObject): self.title = title -class CapLyrics(CapBase): +class CapLyrics(Capability): """ Lyrics websites. """ diff --git a/weboob/capabilities/messages.py b/weboob/capabilities/messages.py index f459834a..6a181d2f 100644 --- a/weboob/capabilities/messages.py +++ b/weboob/capabilities/messages.py @@ -21,7 +21,7 @@ import datetime import time -from .base import CapBase, BaseObject, NotLoaded, Field, StringField, \ +from .base import Capability, BaseObject, NotLoaded, Field, StringField, \ IntField, UserError from .date import DateField @@ -169,7 +169,7 @@ class Thread(_Thread): yield m -class CapMessages(CapBase): +class CapMessages(Capability): """ Capability to read messages. """ @@ -213,7 +213,7 @@ class CantSendMessage(UserError): """ -class CapMessagesPost(CapBase): +class CapMessagesPost(Capability): """ This capability allow user to send a message. """ diff --git a/weboob/capabilities/parcel.py b/weboob/capabilities/parcel.py index 9b5ee0f7..054b8ced 100644 --- a/weboob/capabilities/parcel.py +++ b/weboob/capabilities/parcel.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . -from .base import CapBase, BaseObject, Field, StringField, UserError +from .base import Capability, BaseObject, Field, StringField, UserError from .date import DateField @@ -43,7 +43,7 @@ class Parcel(BaseObject): history = Field('History', list) -class CapParcel(CapBase): +class CapParcel(Capability): def get_parcel_tracking(self, id): """ Get information abouut a parcel. diff --git a/weboob/capabilities/paste.py b/weboob/capabilities/paste.py index 11dfb114..c5bb0f93 100644 --- a/weboob/capabilities/paste.py +++ b/weboob/capabilities/paste.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . -from .base import CapBase, BaseObject, NotLoaded, Field, StringField, UserError +from .base import Capability, BaseObject, NotLoaded, Field, StringField, UserError __all__ = ['PasteNotFound', 'BasePaste', 'CapPaste'] @@ -63,7 +63,7 @@ class BasePaste(BaseObject): return self.id2url(self.id) -class CapPaste(CapBase): +class CapPaste(Capability): """ This capability represents the ability for a website backend to store plain text. """ diff --git a/weboob/capabilities/pricecomparison.py b/weboob/capabilities/pricecomparison.py index e67d79da..6c1b4fa9 100644 --- a/weboob/capabilities/pricecomparison.py +++ b/weboob/capabilities/pricecomparison.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . -from .base import CapBase, BaseObject, Field, DecimalField, \ +from .base import Capability, BaseObject, Field, DecimalField, \ StringField from .date import DateField @@ -53,7 +53,7 @@ class Price(BaseObject): product = Field('Product', Product) -class CapPriceComparison(CapBase): +class CapPriceComparison(Capability): """ Capability for price comparison websites. """ diff --git a/weboob/capabilities/radio.py b/weboob/capabilities/radio.py index f39ed94f..27970a4c 100644 --- a/weboob/capabilities/radio.py +++ b/weboob/capabilities/radio.py @@ -19,7 +19,7 @@ # along with weboob. If not, see . -from .base import CapBase, BaseObject, Field, StringField +from .base import Capability, BaseObject, Field, StringField from weboob.tools.capabilities.streaminfo import StreamInfo @@ -35,7 +35,7 @@ class Radio(BaseObject): current = Field('Current emission', StreamInfo) streams = Field('List of streams', list) -class CapRadio(CapBase): +class CapRadio(Capability): """ Capability of radio websites. """ diff --git a/weboob/capabilities/recipe.py b/weboob/capabilities/recipe.py index 2bb1473d..eb0390e5 100644 --- a/weboob/capabilities/recipe.py +++ b/weboob/capabilities/recipe.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . -from .base import CapBase, BaseObject, StringField, IntField, Field, empty +from .base import Capability, BaseObject, StringField, IntField, Field, empty import lxml.etree as ET @@ -161,7 +161,7 @@ class Recipe(BaseObject): return header + ET.tostring(doc, encoding='UTF-8', pretty_print=True).decode('utf-8') -class CapRecipe(CapBase): +class CapRecipe(Capability): """ Recipe providers. """ diff --git a/weboob/capabilities/subtitle.py b/weboob/capabilities/subtitle.py index 1f92b322..ff53faf0 100644 --- a/weboob/capabilities/subtitle.py +++ b/weboob/capabilities/subtitle.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . -from .base import CapBase, BaseObject, StringField, IntField, UserError +from .base import Capability, BaseObject, StringField, IntField, UserError __all__ = ['Subtitle', 'CapSubtitle'] @@ -48,7 +48,7 @@ class Subtitle(BaseObject): BaseObject.__init__(self, id) self.name = name -class CapSubtitle(CapBase): +class CapSubtitle(Capability): """ Subtitle providers. """ diff --git a/weboob/capabilities/torrent.py b/weboob/capabilities/torrent.py index 43d7579f..4399d549 100644 --- a/weboob/capabilities/torrent.py +++ b/weboob/capabilities/torrent.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . -from .base import CapBase, BaseObject, Field, StringField, FloatField, \ +from .base import Capability, BaseObject, Field, StringField, FloatField, \ IntField, UserError from .date import DateField @@ -54,7 +54,7 @@ class Torrent(BaseObject): self.name = name -class CapTorrent(CapBase): +class CapTorrent(Capability): """ Torrent trackers. """ diff --git a/weboob/capabilities/translate.py b/weboob/capabilities/translate.py index 1dd27aca..a1441086 100644 --- a/weboob/capabilities/translate.py +++ b/weboob/capabilities/translate.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . -from .base import CapBase, BaseObject, StringField, UserError +from .base import Capability, BaseObject, StringField, UserError __all__ = ['TranslationFail', 'LanguageNotSupported', 'CapTranslate'] @@ -51,7 +51,7 @@ class Translation(BaseObject): text = StringField('Translation') -class CapTranslate(CapBase): +class CapTranslate(Capability): """ Capability of online translation website to translate word or sentence """ diff --git a/weboob/capabilities/travel.py b/weboob/capabilities/travel.py index b16f4474..a72c073b 100644 --- a/weboob/capabilities/travel.py +++ b/weboob/capabilities/travel.py @@ -20,7 +20,7 @@ import datetime -from .base import CapBase, BaseObject, StringField, DecimalField, UserError +from .base import Capability, BaseObject, StringField, DecimalField, UserError from .date import TimeField, DeltaField, DateField __all__ = ['Station', 'Departure', 'RoadStep', 'RoadmapError', 'RoadmapFilters', 'CapTravel'] @@ -95,7 +95,7 @@ class RoadmapFilters(BaseObject): BaseObject.__init__(self, '') -class CapTravel(CapBase): +class CapTravel(Capability): """ Travel websites. """ diff --git a/weboob/capabilities/weather.py b/weboob/capabilities/weather.py index ee62a1c5..e1328324 100644 --- a/weboob/capabilities/weather.py +++ b/weboob/capabilities/weather.py @@ -20,7 +20,7 @@ from datetime import datetime, date -from .base import CapBase, BaseObject, Field, FloatField, \ +from .base import Capability, BaseObject, Field, FloatField, \ StringField, UserError from .date import DateField @@ -109,7 +109,7 @@ class CityNotFound(UserError): """ -class CapWeather(CapBase): +class CapWeather(Capability): """ Capability for weather websites. """ diff --git a/weboob/core/ouiboube.py b/weboob/core/ouiboube.py index 4c58ea2e..aac0d836 100644 --- a/weboob/core/ouiboube.py +++ b/weboob/core/ouiboube.py @@ -191,7 +191,7 @@ class WebNip(object): Note: each backend is locked when it is returned. :param caps: optional list of capabilities to select backends - :type caps: tuple[:class:`weboob.capabilities.base.CapBase`] + :type caps: tuple[:class:`weboob.capabilities.base.Capability`] :rtype: iter[:class:`weboob.tools.backend.Module`] """ for _, backend in sorted(self.backend_instances.iteritems()): @@ -222,7 +222,7 @@ class WebNip(object): :param backends: list of backends to iterate on :type backends: list[:class:`str`] :param caps: iterate on backends which implement this caps - :type caps: list[:class:`weboob.capabilities.base.CapBase`] + :type caps: list[:class:`weboob.capabilities.base.Capability`] :rtype: A :class:`weboob.core.bcall.BackendsCall` object (iterable) """ backends = self.backend_instances.values() @@ -392,7 +392,7 @@ class Weboob(WebNip): Load backends listed in config file. :param caps: load backends which implement all of specified caps - :type caps: tuple[:class:`weboob.capabilities.base.CapBase`] + :type caps: tuple[:class:`weboob.capabilities.base.Capability`] :param names: load backends with instance name in list :type names: tuple[:class:`str`] :param modules: load backends which module is in list diff --git a/weboob/tools/backend.py b/weboob/tools/backend.py index 939de884..b13b1585 100644 --- a/weboob/tools/backend.py +++ b/weboob/tools/backend.py @@ -23,7 +23,7 @@ from threading import RLock from copy import copy from weboob.capabilities.base import BaseObject, FieldNotFound, \ - CapBase, NotLoaded, NotAvailable + Capability, NotLoaded, NotAvailable from weboob.tools.misc import iter_fields from weboob.tools.log import getLogger from weboob.tools.value import ValuesDict @@ -350,11 +350,11 @@ class Module(object): """ Iter capabilities implemented by this backend. - :rtype: iter[:class:`weboob.capabilities.base.CapBase`] + :rtype: iter[:class:`weboob.capabilities.base.Capability`] """ def iter_caps(cls): for base in cls.__bases__: - if issubclass(base, CapBase) and base != CapBase: + if issubclass(base, Capability) and base != Capability: yield base for cap in iter_caps(base): yield cap