summary refs log tree commit diff
diff options
context:
space:
mode:
authorJaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>2013-08-28 13:37:31 +0200
committerJaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>2013-08-28 13:37:31 +0200
commit8ae97d76eee1bf9e9098797db3be2d7b816196b2 (patch)
tree676d1e5fe70d1c6bcc4559ad65f5c1999708d52f
parent6d69d03bac08f8381031de721167103697bf3fed (diff)
downloadyoutube-dl-8ae97d76eee1bf9e9098797db3be2d7b816196b2.tar.gz
youtube-dl-8ae97d76eee1bf9e9098797db3be2d7b816196b2.tar.xz
youtube-dl-8ae97d76eee1bf9e9098797db3be2d7b816196b2.zip
PostProcessingError holds the message in the 'msg' property, not in 'message' (fixes #1323)
Causes DeprecationWarning: http://www.python.org/dev/peps/pep-0352/
-rw-r--r--youtube_dl/PostProcessor.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/youtube_dl/PostProcessor.py b/youtube_dl/PostProcessor.py
index c02ed7148..ae56d2082 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)