From d23d9672c621af8f553e6357f0659435d5a56f9a Mon Sep 17 00:00:00 2001 From: Florent Date: Mon, 16 Dec 2013 12:06:56 +0100 Subject: [PATCH] Pep8 Capa --- weboob/capabilities/audio.py | 12 +++++++----- weboob/capabilities/audiostream.py | 13 +++++++------ weboob/capabilities/file.py | 6 ++++-- 3 files changed, 18 insertions(+), 13 deletions(-) diff --git a/weboob/capabilities/audio.py b/weboob/capabilities/audio.py index 05a691d1..20d1506b 100644 --- a/weboob/capabilities/audio.py +++ b/weboob/capabilities/audio.py @@ -20,11 +20,12 @@ from datetime import timedelta -from .base import IBaseCap, CapBaseObject,Field, StringField +from .base import IBaseCap, CapBaseObject, Field, StringField from .file import ICapFile, BaseFile -__all__ = ['BaseAudio','ICapAudio'] +__all__ = ['BaseAudio', 'ICapAudio'] + class BaseAudio(BaseFile): """ @@ -32,14 +33,15 @@ class BaseAudio(BaseFile): """ ext = StringField('Audio file extension') duration = Field('Audio file duration', int, long, timedelta) - bitrate = Field('Audio stream bit rate un Kbps',int) + bitrate = Field('Audio stream bit rate un Kbps', int) format = StringField('Audio stream format') + class ICapAudio(ICapFile): """ Audio file provider """ - def search_audio(self,pattern,sortby=ICapFile.SEARCH_RELEVANCE): + def search_audio(self, pattern, sortby=ICapFile.SEARCH_RELEVANCE): """ search for a audio file @@ -48,7 +50,7 @@ class ICapAudio(ICapFile): :param sortby: sort by ...(use SEARCH_* constants) :rtype: iter[:class:`BaseAudio`] """ - return self.search_file(pattern,sortby) + return self.search_file(pattern, sortby) def get_audio(self, id): """ diff --git a/weboob/capabilities/audiostream.py b/weboob/capabilities/audiostream.py index 163efda9..7879bea3 100644 --- a/weboob/capabilities/audiostream.py +++ b/weboob/capabilities/audiostream.py @@ -25,14 +25,15 @@ from .file import ICapFile from .audio import ICapAudio, BaseAudio -__all__ = ['AudioStreamInfo','BaseAudioStream','ICapAudioStream'] +__all__ = ['AudioStreamInfo', 'BaseAudioStream', 'ICapAudioStream'] + class AudioStreamInfo(CapBaseObject): """ AudioStream related information. """ - who = StringField('Who is currently on air') - what = StringField('What is currently on air') + who = StringField('Who is currently on air') + what = StringField('What is currently on air') def __iscomplete__(self): # This volatile information may be reloaded everytimes. @@ -49,7 +50,7 @@ class BaseAudioStream(BaseAudio): """ Audio stream object """ - current = Field('Information related to current broadcast',AudioStreamInfo) + current = Field('Information related to current broadcast', AudioStreamInfo) def __unicode__(self): return u'%s (%s)' % (self.title, self.url) @@ -57,6 +58,7 @@ class BaseAudioStream(BaseAudio): def __repr__(self): return self.__unicode__() + class ICapAudioStream(ICapAudio): """ Audio streams provider @@ -70,7 +72,7 @@ class ICapAudioStream(ICapAudio): :param sortby: sort by ... (use SEARCH_* constants) :rtype: iter[:class:`BaseAudioStream`] """ - return self.search_audio(self,pattern,sortby) + return self.search_audio(self, pattern, sortby) def get_audiostream(self, id): """ @@ -81,4 +83,3 @@ class ICapAudioStream(ICapAudio): :rtype: :class:`BaseAudioStream` """ return self.get_audio(self, id) - diff --git a/weboob/capabilities/file.py b/weboob/capabilities/file.py index 7881603f..48f256b8 100644 --- a/weboob/capabilities/file.py +++ b/weboob/capabilities/file.py @@ -21,7 +21,8 @@ from .base import IBaseCap, CapBaseObject, NotAvailable, Field, StringField, DateField -__all__ = ['BaseFile','ICapFile'] +__all__ = ['BaseFile', 'ICapFile'] + class BaseFile(CapBaseObject): """ @@ -49,6 +50,7 @@ class BaseFile(CapBaseObject): """ return self.id2url(self.id) + class ICapFile(IBaseCap): """ Provide file download @@ -58,7 +60,7 @@ class ICapFile(IBaseCap): SEARCH_VIEWS, SEARCH_DATE) = range(4) - def search_file(self,pattern,sortby=SEARCH_RELEVANCE): + def search_file(self, pattern, sortby=SEARCH_RELEVANCE): """ :param pattern: pattern to search on :type pattern: str