pep 8 en lvc/converter.py

1 files changed, 14 insertions, 5 deletions

diff --git a/lvc/converter.py b/lvc/converter.py
index ed4e16c..c3eb7ac 100644
--- a/lvc/converter.py
+++ b/lvc/converter.py
@@ -1,3 +1,5 @@
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
 import json
 import logging
 import os
@@ -14,6 +16,7 @@ logger = logging.getLogger(__name__)
 
 NON_WORD_CHARS = re.compile(r"[^a-zA-Z0-9]+")
 
+
 class ConverterInfo(object):
     """Describes a particular output converter
 
@@ -27,7 +30,7 @@ class ConverterInfo(object):
     be changed to reflect the user overriding the default.
     :attribute height: output height for this converter.  Works just like
     width
-    :attribute dont_upsize: should we allow upsizing for conversions? 
+    :attribute dont_upsize: should we allow upsizing for conversions?
     """
     media_type = None
     bitrate = None
@@ -76,7 +79,7 @@ class ConverterInfo(object):
         else:
             try:
                 shutil.move(temp_output, output)
-            except EnvironmentError, e:
+            except EnvironmentError as e:
                 needs_remove = True
                 err = e
         # If it didn't work for some reason try to clean up the stale stuff.
@@ -85,7 +88,7 @@ class ConverterInfo(object):
         if needs_remove:
             try:
                 os.remove(temp_output)
-            except EnvironmentError, e:
+            except EnvironmentError as e:
                 logging.error('finalize(): cannot remove stale file %r',
                               temp_output)
                 if err:
@@ -105,6 +108,7 @@ class ConverterInfo(object):
     def process_status_line(self, line):
         raise NotImplementedError
 
+
 class FFmpegConverterInfo(ConverterInfo):
     """Base class for all ffmpeg-based conversions.
 
@@ -128,7 +132,7 @@ class FFmpegConverterInfo(ConverterInfo):
 
     def get_arguments(self, video, output):
         args = ['-i', utils.convert_path_for_subprocess(video.filename),
-                 '-strict', 'experimental']
+                '-strict', 'experimental']
         args.extend(settings.customize_ffmpeg_parameters(
             self.get_parameters(video)))
         if not (self.audio_only or video.audio_only):
@@ -198,18 +202,22 @@ class FFmpegConverterInfo(ConverterInfo):
         if match is not None:
             return {'finished': True}
 
+
 class FFmpegConverterInfo1080p(FFmpegConverterInfo):
     def __init__(self, name):
         FFmpegConverterInfo.__init__(self, name, 1920, 1080)
 
+
 class FFmpegConverterInfo720p(FFmpegConverterInfo):
     def __init__(self, name):
         FFmpegConverterInfo.__init__(self, name, 1080, 720)
 
+
 class FFmpegConverterInfo480p(FFmpegConverterInfo):
     def __init__(self, name):
         FFmpegConverterInfo.__init__(self, name, 720, 480)
 
+
 class ConverterManager(object):
     def __init__(self):
         self.converters = {}
@@ -261,7 +269,8 @@ class ConverterManager(object):
                         brand, realconverters = converter
                         for realconverter in realconverters:
                             self.brand_rmap[realconverter] = brand
-                            self.brand_map.setdefault(brand, []).append(realconverter)
+                            self.brand_map.setdefault(brand,
+                                                      []).append(realconverter)
                             self.add_converter(realconverter)
                     else:
                         self.brand_rmap[converter] = None