From: Jaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>
Date: Wed, 28 Aug 2013 11:37:31 +0000 (+0200)
Subject: PostProcessingError holds the message in the 'msg' property, not in 'message' (fixes... 
X-Git-Tag: 2013.08.28.1~3^2
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=8ae97d76eee1bf9e9098797db3be2d7b816196b2;p=youtube-dl.git

PostProcessingError holds the message in the 'msg' property, not in 'message' (fixes #1323)

Causes DeprecationWarning: http://www.python.org/dev/peps/pep-0352/
---

diff --git a/youtube_dl/PostProcessor.py b/youtube_dl/PostProcessor.py
index c02ed7148c..ae56d2082d 100644
--- a/youtube_dl/PostProcessor.py
+++ b/youtube_dl/PostProcessor.py
@@ -137,7 +137,7 @@ class FFmpegExtractAudioPP(FFmpegPostProcessor):
         try:
             FFmpegPostProcessor.run_ffmpeg(self, path, out_path, opts)
         except FFmpegPostProcessorError as err:
-            raise AudioConversionError(err.message)
+            raise AudioConversionError(err.msg)
 
     def run(self, information):
         path = information['filepath']
@@ -207,7 +207,7 @@ class FFmpegExtractAudioPP(FFmpegPostProcessor):
         except:
             etype,e,tb = sys.exc_info()
             if isinstance(e, AudioConversionError):
-                msg = u'audio conversion failed: ' + e.message
+                msg = u'audio conversion failed: ' + e.msg
             else:
                 msg = u'error running ' + (self._exes['avconv'] and 'avconv' or 'ffmpeg')
             raise PostProcessingError(msg)