youtube-dl

commit 40a90862f49f89bdfcd6feea5340538efc2b6a5c
parent 511c4325dc8e3a60d81d3c23e8eb330b3a706883
Author: Jaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>
Date:   Sun, 10 Aug 2014 11:00:14 +0200

[reverbnation] The 'uploader_id' field must be a string

Diffstat:
M
youtube_dl/extractor/reverbnation.py
 | 
6
+++---
M
youtube_dl/utils.py
 | 
3
+++

2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/youtube_dl/extractor/reverbnation.py b/youtube_dl/extractor/reverbnation.py
@@ -3,7 +3,7 @@ from __future__ import unicode_literals
 import re
 
 from .common import InfoExtractor
-from ..utils import strip_jsonp
+from ..utils import str_or_none
 
 
 class ReverbNationIE(InfoExtractor):
@@ -16,7 +16,7 @@ class ReverbNationIE(InfoExtractor):
             "ext": "mp3",
             "title": "MONA LISA",
             "uploader": "ALKILADOS",
-            "uploader_id": 216429,
+            "uploader_id": "216429",
             "thumbnail": "re:^https://gp1\.wac\.edgecastcdn\.net/.*?\.jpg$"
         },
     }]
@@ -36,7 +36,7 @@ class ReverbNationIE(InfoExtractor):
             'title': api_res.get('name'),
             'url': api_res.get('url'),
             'uploader': api_res.get('artist', {}).get('name'),
-            'uploader_id': api_res.get('artist', {}).get('id'),
+            'uploader_id': str_or_none(api_res.get('artist', {}).get('id')),
             'thumbnail': self._proto_relative_url(
                 api_res.get('image', api_res.get('thumbnail'))),
             'ext': 'mp3',
diff --git a/youtube_dl/utils.py b/youtube_dl/utils.py
@@ -1275,6 +1275,9 @@ def int_or_none(v, scale=1, default=None, get_attr=None, invscale=1):
             v = getattr(v, get_attr, None)
     return default if v is None else (int(v) * invscale // scale)
 
+def str_or_none(v, default=None):
+    return default if v is None else compat_str(v)
+
 
 def str_to_int(int_str):
     if int_str is None: