Fix PEP8 on timeside/encoder/ with autopep8

diff --git a/timeside/encoder/__init__.py b/timeside/encoder/__init__.py
index 0d341a2073aa1a1abf4a4a84c1d3f07aad17c11b..4303fa2838b88934f7aa04ad0802507f9daf7f9c 100644 (file)
--- a/timeside/encoder/__init__.py
+++ b/timeside/encoder/__init__.py
@@ -7,4 +7,4 @@ from flac import FlacEncoder
 from m4a import AacEncoder
 from webm import WebMEncoder
 from audiosink import AudioSink
-from opus import OpusEncoder
\ No newline at end of file
+from opus import OpusEncoder

diff --git a/timeside/encoder/audiosink.py b/timeside/encoder/audiosink.py
index b7e6531c1d3e75ab21c7852964fba2c0c276b089..524d685f604435c4f4d34af0a1e83c6fb52b62fe 100644 (file)
--- a/timeside/encoder/audiosink.py
+++ b/timeside/encoder/audiosink.py
@@ -25,7 +25,9 @@ from timeside.encoder.core import GstEncoder
 from timeside.api import IEncoder
 from timeside.tools import *
 
+
 class AudioSink(GstEncoder):
+
     """gstreamer-based Audio Sink
 
     This encoder plays the decoded audio stream to the sound card

diff --git a/timeside/encoder/core.py b/timeside/encoder/core.py
index ef7614e43d9064e144ddac8ebb085cc59378772c..72acbf2f4a98a3a79183d667fd9191e02596940f 100644 (file)
--- a/timeside/encoder/core.py
+++ b/timeside/encoder/core.py
@@ -54,7 +54,8 @@ class GstEncoder(Processor):
             if os.path.isdir(output):
                 raise IOError("Encoder output must be a file, not a directory")
             elif os.path.isfile(output) and not overwrite:
-                raise IOError("Encoder output %s exists, but overwrite set to False")
+                raise IOError(
+                    "Encoder output %s exists, but overwrite set to False")
             self.filename = output
         else:
             self.filename = None
@@ -145,7 +146,7 @@ class GstEncoder(Processor):
             self.end_cond.release()
 
     def _on_new_buffer_streaming(self, appsink):
-        #print 'pull-buffer'
+        # print 'pull-buffer'
         chunk = appsink.emit('pull-buffer')
         self._streaming_queue.put(chunk)
 

diff --git a/timeside/encoder/flac.py b/timeside/encoder/flac.py
index e35dfaae651bf70118784917b32da031080e708d..542079bdc7232e4999ae8d174a1e8fc65ab80fd7 100644 (file)
--- a/timeside/encoder/flac.py
+++ b/timeside/encoder/flac.py
@@ -26,12 +26,14 @@ from timeside.tools import *
 
 
 class FlacEncoder(GstEncoder):
+
     """ gstreamer-based FLAC encoder """
     implements(IEncoder)
 
     @interfacedoc
     def setup(self, channels=None, samplerate=None, blocksize=None, totalframes=None):
-        super(FlacEncoder, self).setup(channels, samplerate, blocksize, totalframes)
+        super(FlacEncoder, self).setup(
+            channels, samplerate, blocksize, totalframes)
 
         self.pipe = ''' appsrc name=src ! audioconvert
                         ! flacenc '''
@@ -42,14 +44,13 @@ class FlacEncoder(GstEncoder):
             t. ! queue ! appsink name=app sync=False
             ''' % self.filename
 
-        elif self.filename :
+        elif self.filename:
             self.pipe += '! filesink location=%s async=False sync=False ' % self.filename
         else:
             self.pipe += '! queue ! appsink name=app sync=False '
 
         self.start_pipeline(channels, samplerate)
 
-
     @staticmethod
     @interfacedoc
     def id():

diff --git a/timeside/encoder/m4a.py b/timeside/encoder/m4a.py
index c23e3d7ac61d8f32d53f581ce36ed01b3a60c711..a036d21f40e094519cd333b7320eef4f88a82713 100644 (file)
--- a/timeside/encoder/m4a.py
+++ b/timeside/encoder/m4a.py
@@ -26,17 +26,19 @@ from timeside.tools import *
 
 
 class AacEncoder(GstEncoder):
+
     """ gstreamer-based AAC encoder """
     implements(IEncoder)
 
-    def __init__(self, output, streaming = False, overwrite = False):
+    def __init__(self, output, streaming=False, overwrite=False):
         super(AacEncoder, self).__init__(output, streaming, overwrite)
         if self.streaming:
             raise Exception("Streaming not supported")
 
     @interfacedoc
     def setup(self, channels=None, samplerate=None, blocksize=None, totalframes=None):
-        super(AacEncoder, self).setup(channels, samplerate, blocksize, totalframes)
+        super(AacEncoder, self).setup(
+            channels, samplerate, blocksize, totalframes)
 
         self.streaming = False
         self.pipe = ''' appsrc name=src
@@ -51,14 +53,13 @@ class AacEncoder(GstEncoder):
             t. ! queue ! appsink name=app sync=False
             ''' % self.filename
 
-        elif self.filename :
+        elif self.filename:
             self.pipe += '! filesink location=%s async=False sync=False ' % self.filename
         else:
             self.pipe += '! queue ! appsink name=app sync=False '
 
         self.start_pipeline(channels, samplerate)
 
-
     @staticmethod
     @interfacedoc
     def id():

diff --git a/timeside/encoder/mp3.py b/timeside/encoder/mp3.py
index eee74cf146e6f8bfc091685123e4a5347e05c0c7..5ff28f6cff2d19a121165f1c3dc359d12f955175 100644 (file)
--- a/timeside/encoder/mp3.py
+++ b/timeside/encoder/mp3.py
@@ -30,8 +30,8 @@ from timeside.encoder.core import GstEncoder
 from timeside.api import IEncoder
 
 
-
 class Mp3Encoder(GstEncoder):
+
     """ gstreamer-based MP3 encoder """
     implements(IEncoder)
 
@@ -98,7 +98,7 @@ class Mp3Encoder(GstEncoder):
             try:
                 id3.add(frame)
             except:
-                raise IOError('EncoderError: cannot tag "'+tag+'"')
+                raise IOError('EncoderError: cannot tag "' + tag + '"')
         try:
             id3.save()
         except:

diff --git a/timeside/encoder/ogg.py b/timeside/encoder/ogg.py
index e56741f7582e5f40d63034eef85070c573a046d1..cf1f249a0a6a58ed144e4c339d08b8a92d930571 100644 (file)
--- a/timeside/encoder/ogg.py
+++ b/timeside/encoder/ogg.py
@@ -24,13 +24,16 @@ from timeside.encoder.core import GstEncoder
 from timeside.api import IEncoder
 from timeside.tools import *
 
+
 class VorbisEncoder(GstEncoder):
+
     """ gstreamer-based OGG Vorbis encoder """
     implements(IEncoder)
 
     @interfacedoc
     def setup(self, channels=None, samplerate=None, blocksize=None, totalframes=None):
-        super(VorbisEncoder, self).setup(channels, samplerate, blocksize, totalframes)
+        super(VorbisEncoder, self).setup(
+            channels, samplerate, blocksize, totalframes)
         self.pipe = ''' appsrc name=src
                   ! audioconvert ! audioresample
                   ! vorbisenc quality=0.9
@@ -43,14 +46,13 @@ class VorbisEncoder(GstEncoder):
             t. ! queue ! appsink name=app sync=False
             ''' % self.filename
 
-        elif self.filename :
+        elif self.filename:
             self.pipe += '! filesink location=%s async=False sync=False ' % self.filename
         else:
             self.pipe += '! queue ! appsink name=app sync=False '
 
         self.start_pipeline(channels, samplerate)
 
-
     @staticmethod
     @interfacedoc
     def id():
@@ -79,4 +81,3 @@ class VorbisEncoder(GstEncoder):
     @interfacedoc
     def set_metadata(self, metadata):
         self.metadata = metadata
-

diff --git a/timeside/encoder/opus.py b/timeside/encoder/opus.py
index 0a185f666fce4a424fac00b2b626b37d0a6b50e1..301e0b2b6e74e7cd72c4244fda182ae7eedf4e4c 100644 (file)
--- a/timeside/encoder/opus.py
+++ b/timeside/encoder/opus.py
@@ -31,6 +31,7 @@ from timeside.api import IEncoder
 
 
 class OpusEncoder(GstEncoder):
+
     """ gstreamer-based Opus encoder """
     implements(IEncoder)
 

diff --git a/timeside/encoder/wav.py b/timeside/encoder/wav.py
index 69d5557e9b845db8fe5220602329a393a171daf4..99c9a4b1ba41f91131e8c5d63c5c2bcbd87ba1f5 100644 (file)
--- a/timeside/encoder/wav.py
+++ b/timeside/encoder/wav.py
@@ -27,12 +27,14 @@ from timeside.tools import *
 
 
 class WavEncoder(GstEncoder):
+
     """ gstreamer-based WAV encoder """
     implements(IEncoder)
 
     @interfacedoc
     def setup(self, channels=None, samplerate=None, blocksize=None, totalframes=None):
-        super(WavEncoder, self).setup(channels, samplerate, blocksize, totalframes)
+        super(WavEncoder, self).setup(
+            channels, samplerate, blocksize, totalframes)
 
         self.pipe = ''' appsrc name=src
                   ! audioconvert
@@ -44,14 +46,13 @@ class WavEncoder(GstEncoder):
             t. ! queue ! appsink name=app sync=False
             ''' % self.filename
 
-        elif self.filename :
+        elif self.filename:
             self.pipe += '! filesink location=%s async=False sync=False ' % self.filename
         else:
             self.pipe += '! queue ! appsink name=app sync=False '
 
         self.start_pipeline(channels, samplerate)
 
-
     @staticmethod
     @interfacedoc
     def id():
@@ -79,5 +80,5 @@ class WavEncoder(GstEncoder):
 
     @interfacedoc
     def set_metadata(self, metadata):
-        #TODO
+        # TODO
         pass

diff --git a/timeside/encoder/webm.py b/timeside/encoder/webm.py
index 5ff95942621247c64ed88c1f6183625d7f68b600..de01d48ca49e02d43eae39ce9235f26ee01f87ae 100644 (file)
--- a/timeside/encoder/webm.py
+++ b/timeside/encoder/webm.py
@@ -26,6 +26,7 @@ from timeside.tools import *
 
 
 class WebMEncoder(GstEncoder):
+
     """ gstreamer-based WebM encoder """
     implements(IEncoder)