update from upstream

1 files changed, 4 insertions, 6 deletions

diff --git a/hypervideo_dl/extractor/vube.py b/hypervideo_dl/extractor/vube.py
index 8ce3a6b..1c8f80a 100644
--- a/hypervideo_dl/extractor/vube.py
+++ b/hypervideo_dl/extractor/vube.py
@@ -1,6 +1,5 @@
 from __future__ import unicode_literals
 
-import re
 
 from .common import InfoExtractor
 from ..compat import (
@@ -8,7 +7,6 @@ from ..compat import (
 )
 from ..utils import (
     int_or_none,
-    ExtractorError,
 )
 
 
@@ -99,7 +97,7 @@ class VubeIE(InfoExtractor):
     ]
 
     def _real_extract(self, url):
-        mobj = re.match(self._VALID_URL, url)
+        mobj = self._match_valid_url(url)
         video_id = mobj.group('id')
 
         video = self._download_json(
@@ -125,13 +123,13 @@ class VubeIE(InfoExtractor):
                 })
             formats.append(fmt)
 
-        self._sort_formats(formats)
-
         if not formats and video.get('vst') == 'dmca':
-            raise ExtractorError(
+            self.raise_no_formats(
                 'This video has been removed in response to a complaint received under the US Digital Millennium Copyright Act.',
                 expected=True)
 
+        self._sort_formats(formats)
+
         title = video['title']
         description = video.get('description')
         thumbnail = self._proto_relative_url(video.get('thumbnail_src'), scheme='http:')