From fc6f7d8c21fdc7fb10be6d043a572536f941f1f4 Mon Sep 17 00:00:00 2001 From: Florent Date: Tue, 18 Mar 2014 11:51:02 +0100 Subject: [PATCH] NotAvailable and NotLoaded should not be callable --- weboob/capabilities/base.py | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/weboob/capabilities/base.py b/weboob/capabilities/base.py index a21ca6cc..95aa159e 100644 --- a/weboob/capabilities/base.py +++ b/weboob/capabilities/base.py @@ -82,7 +82,10 @@ class AttributeCreationWarning(UserWarning): """ -class NotAvailableMeta(type): +class NotAvailableType(object): + """ + NotAvailable is a constant to use on non available fields. + """ def __str__(self): return unicode(self).decode('utf-8') @@ -92,15 +95,17 @@ class NotAvailableMeta(type): def __nonzero__(self): return False +NotAvailable = NotAvailableType() -class NotAvailable(object): + +class NotLoadedType(object): """ - Constant to use on non available fields. + NotLoaded is a constant to use on not loaded fields. + + When you use :func:`weboob.tools.backend.BaseBackend.fillobj` on a object based on :class:`CapBaseObject`, + it will request all fields with this value. """ - __metaclass__ = NotAvailableMeta - -class NotLoadedMeta(type): def __str__(self): return unicode(self).decode('utf-8') @@ -110,15 +115,7 @@ class NotLoadedMeta(type): def __nonzero__(self): return False - -class NotLoaded(object): - """ - Constant to use on not loaded fields. - - When you use :func:`weboob.tools.backend.BaseBackend.fillobj` on a object based on :class:`CapBaseObject`, - it will request all fields with this value. - """ - __metaclass__ = NotLoadedMeta +NotLoaded = NotLoadedType() class IBaseCap(object):