From 20556c24973cc1dd1c5cfcb72d136a606f6d38c6 Mon Sep 17 00:00:00 2001
From: John Hawkinson <jhawk@mit.edu>
Date: Sat, 18 Feb 2017 21:03:12 -0500
Subject: [PATCH] cleanup remnants from cherry-pick

---
 youtube_dl/extractor/brightcove.py |  3 +--
 youtube_dl/extractor/generic.py    | 21 ---------------------
 2 files changed, 1 insertion(+), 23 deletions(-)

diff --git a/youtube_dl/extractor/brightcove.py b/youtube_dl/extractor/brightcove.py
index 5e482c7ba..dea38a8d7 100644
--- a/youtube_dl/extractor/brightcove.py
+++ b/youtube_dl/extractor/brightcove.py
@@ -16,7 +16,6 @@ from ..compat import (
 )
 from ..utils import (
     determine_ext,
-    dict_get,
     ExtractorError,
     extract_attributes,
     find_xpath_attr,
@@ -514,7 +513,7 @@ class BrightcoveNewIE(InfoExtractor):
         for video in re.findall(r'(?i)(<video[^>]+>)', webpage):
             attrs = extract_attributes(video)
                 
-            video_id    = dict_get(attrs, ['data-brightcove-video-id', 'data-video-id'])
+            video_id    = attrs.get('data-video-id')
             account_id  = attrs.get('data-account')
             player_id   = attrs.get('data-player')
             embed       = attrs.get('data-embed')
diff --git a/youtube_dl/extractor/generic.py b/youtube_dl/extractor/generic.py
index 19aa78565..4a571956f 100644
--- a/youtube_dl/extractor/generic.py
+++ b/youtube_dl/extractor/generic.py
@@ -447,27 +447,6 @@ class GenericIE(InfoExtractor):
                 },
             }],
         },
-        {
-            # Brightcove with metadata on one line
-            'url': 'http://www.bostonglobe.com/metro/2017/02/11/tree-finally-succumbs-disease-leaving-hole-neighborhood/h1b4lviqzMTIn9sVy8F3gP/story.html?',
-            'info_dict': {
-                'id': 'story',
-                'title': 'A tree finally succumbs to disease, leaving a hole in a neighborhood - The Boston Globe',
-            },
-            'playlist': [{
-                'info_dict': {
-                    'id': '5320421710001',
-                    'ext': 'mp4',
-                    'title': 'A tree finally succumbs to disease, leaving a hole in a neighborhood',
-                    'description': 'It arrived as a sapling when the Back Bay was in its infancy, a spindly American elm tamped down into a square of dirt cut into the brick sidewalk of 1880s Marlborough Street, no higher than the first bay window of the new brownstone behind it.',
-                    'timestamp': 1486877593,
-                    'upload_date': '20170212',
-                    'uploader_id': '245991542',
-                },
-            }],
-            # HEAD requests produce 404 :(
-            'expected_warnings': ['404'],
-        },
         {
             # Alternative brightcove <video> attributes
             'url': 'http://www.programme-tv.net/videos/extraits/81095-guillaume-canet-evoque-les-rumeurs-d-infidelite-de-marion-cotillard-avec-brad-pitt-dans-vivement-dimanche/',