From ab7057b0387fb3eafb738fdbd50ea9d56c2dbfb4 Mon Sep 17 00:00:00 2001 From: Romain Bignon Date: Sat, 5 Jul 2014 17:20:53 +0200 Subject: [PATCH] fix repr() and str() on File-based objects --- weboob/capabilities/file.py | 6 ++++++ weboob/capabilities/image.py | 6 ------ weboob/capabilities/video.py | 1 + 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/weboob/capabilities/file.py b/weboob/capabilities/file.py index e49aad42..b32c7220 100644 --- a/weboob/capabilities/file.py +++ b/weboob/capabilities/file.py @@ -38,6 +38,12 @@ class BaseFile(CapBaseObject): rating = Field('Rating', int, long, float, default=NotAvailable) rating_max = Field('Maximum rating', int, long, float, default=NotAvailable) + def __str__(self): + return self.url or '' + + def __repr__(self): + return '<%s title=%r url=%r>' % (type(self).__name__, self.title, self.url) + @classmethod def id2url(cls, _id): """ diff --git a/weboob/capabilities/image.py b/weboob/capabilities/image.py index 7c1d7367..f772f9aa 100644 --- a/weboob/capabilities/image.py +++ b/weboob/capabilities/image.py @@ -39,12 +39,6 @@ class BaseImage(_BaseImage): thumbnail = Field('Thumbnail of the image', _BaseImage) data = BytesField('Data of image') - def __str__(self): - return self.url - - def __repr__(self): - return '' % self.url - def __iscomplete__(self): return self.data is not NotLoaded diff --git a/weboob/capabilities/video.py b/weboob/capabilities/video.py index 4cccc956..7b280897 100644 --- a/weboob/capabilities/video.py +++ b/weboob/capabilities/video.py @@ -35,6 +35,7 @@ class BaseVideo(BaseImage): """ duration = Field('file duration', int, long, timedelta) + class ICapVideo(ICapImage): """ Video file provider.