update from upstream

1 files changed, 4 insertions, 5 deletions

diff --git a/hypervideo_dl/extractor/ninecninemedia.py b/hypervideo_dl/extractor/ninecninemedia.py
index cfc2203..4aaf21a 100644
--- a/hypervideo_dl/extractor/ninecninemedia.py
+++ b/hypervideo_dl/extractor/ninecninemedia.py
@@ -1,11 +1,9 @@
 # coding: utf-8
 from __future__ import unicode_literals
 
-import re
 
 from .common import InfoExtractor
 from ..utils import (
-    ExtractorError,
     float_or_none,
     int_or_none,
     parse_iso8601,
@@ -20,7 +18,7 @@ class NineCNineMediaIE(InfoExtractor):
     _API_BASE_TEMPLATE = 'http://capi.9c9media.com/destinations/%s/platforms/desktop/contents/%s/'
 
     def _real_extract(self, url):
-        destination_code, content_id = re.match(self._VALID_URL, url).groups()
+        destination_code, content_id = self._match_valid_url(url).groups()
         api_base_url = self._API_BASE_TEMPLATE % (destination_code, content_id)
         content = self._download_json(api_base_url, content_id, query={
             '$include': '[Media.Name,Season,ContentPackages.Duration,ContentPackages.Id]',
@@ -34,8 +32,9 @@ class NineCNineMediaIE(InfoExtractor):
                 '$include': '[HasClosedCaptions]',
             })
 
-        if try_get(content_package, lambda x: x['Constraints']['Security']['Type']):
-            raise ExtractorError('This video is DRM protected.', expected=True)
+        if (not self.get_param('allow_unplayable_formats')
+                and try_get(content_package, lambda x: x['Constraints']['Security']['Type'])):
+            self.report_drm(content_id)
 
         manifest_base_url = content_package_url + 'manifest.'
         formats = []