From: Yen Chi Hsuan <yan12125@gmail.com>
Date: Thu, 5 Jan 2017 10:45:26 +0000 (+0800)
Subject: [discoverygo] Fix JSON data parsing
X-Git-Url: http://git.bitcoin.ninja/?a=commitdiff_plain;h=24d8a75982de3fd2fefd2c0d4a1248d03997d843;p=youtube-dl

[discoverygo] Fix JSON data parsing

HTMLParser, which is used by extract_attributes, already unescapes
attribute values with HTMLParser.unescape. They shouldn't be unescaped
again, to there may be parsing errors.

Ref: #11219, #11522
---

diff --git a/ChangeLog b/ChangeLog
index a31b676e3..f3e9e1b5f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+version <unreleased>
+
+Extractors
+* [discoverygo] Fix JSON data parsing (#11219, #11522)
+
+
 version 2017.01.05
 
 Extractors
diff --git a/youtube_dl/extractor/discoverygo.py b/youtube_dl/extractor/discoverygo.py
index c4e83b2c3..2042493a8 100644
--- a/youtube_dl/extractor/discoverygo.py
+++ b/youtube_dl/extractor/discoverygo.py
@@ -6,7 +6,6 @@ from ..utils import (
     extract_attributes,
     int_or_none,
     parse_age_limit,
-    unescapeHTML,
     ExtractorError,
 )
 
@@ -49,7 +48,7 @@ class DiscoveryGoIE(InfoExtractor):
                 webpage, 'video container'))
 
         video = self._parse_json(
-            unescapeHTML(container.get('data-video') or container.get('data-json')),
+            container.get('data-video') or container.get('data-json'),
             display_id)
 
         title = video['name']