From 40a90862f49f89bdfcd6feea5340538efc2b6a5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaime=20Marqui=CC=81nez=20Ferra=CC=81ndiz?= Date: Sun, 10 Aug 2014 11:00:14 +0200 Subject: [PATCH] [reverbnation] The 'uploader_id' field must be a string --- youtube_dl/extractor/reverbnation.py | 6 +++--- 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 index b93adfca5..ec7e7df7b 100644 --- a/youtube_dl/extractor/reverbnation.py +++ b/youtube_dl/extractor/reverbnation.py @@ -3,7 +3,7 @@ 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 @@ def _real_extract(self, url): '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 index e40b367c2..9b94407f4 100644 --- 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: