Update upstream source from tag 'upstream/2020.06.16.1'

[youtubedl] / youtube_dl / extractor / vidme.py

diff --git a/youtube_dl/extractor/vidme.py b/youtube_dl/extractor/vidme.py
index 59adb2377e06c95bb8681432a0411723b7879945..174e69cd6b1e8ce1e5bf829781140ea756bdc6bf 100644 (file)
--- a/youtube_dl/extractor/vidme.py
+++ b/youtube_dl/extractor/vidme.py
@@ -3,15 +3,13 @@ from __future__ import unicode_literals
 import itertools
 
 from .common import InfoExtractor
 import itertools
 
 from .common import InfoExtractor

-from ..compat import (
-    compat_HTTPError,
-    compat_str,
-)
+from ..compat import compat_HTTPError

 from ..utils import (
     ExtractorError,
     int_or_none,
     float_or_none,
     parse_iso8601,
 from ..utils import (
     ExtractorError,
     int_or_none,
     float_or_none,
     parse_iso8601,

+    url_or_none,

 )
 
 
 )
 
 


@@ -166,8 +164,8 @@ class VidmeIE(InfoExtractor):
 
         formats = []
         for f in video.get('formats', []):
 
         formats = []
         for f in video.get('formats', []):

-            format_url = f.get('uri')
-            if not format_url or not isinstance(format_url, compat_str):
+            format_url = url_or_none(f.get('uri'))
+            if not format_url:

                 continue
             format_type = f.get('type')
             if format_type == 'dash':
                 continue
             format_type = f.get('type')
             if format_type == 'dash':