Update upstream source from tag 'upstream/2019.06.08'

[youtubedl] / youtube_dl / extractor / cammodels.py

diff --git a/youtube_dl/extractor/cammodels.py b/youtube_dl/extractor/cammodels.py
index ee0165dbaa20c3b3d4ecca53fbb748cb3f823bf8..1eb81b75e95044d460d7f53e1d59e9ec174c6480 100644 (file)
--- a/youtube_dl/extractor/cammodels.py
+++ b/youtube_dl/extractor/cammodels.py
@@ -2,10 +2,10 @@
 from __future__ import unicode_literals
 
 from .common import InfoExtractor
 from __future__ import unicode_literals
 
 from .common import InfoExtractor

-from ..compat import compat_str

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

+    url_or_none,

 )
 
 
 )
 
 


@@ -14,6 +14,7 @@ class CamModelsIE(InfoExtractor):
     _TESTS = [{
         'url': 'https://www.cammodels.com/cam/AutumnKnight/',
         'only_matching': True,
     _TESTS = [{
         'url': 'https://www.cammodels.com/cam/AutumnKnight/',
         'only_matching': True,

+        'age_limit': 18

     }]
 
     def _real_extract(self, url):
     }]
 
     def _real_extract(self, url):


@@ -56,8 +57,8 @@ class CamModelsIE(InfoExtractor):
             for media in encodings:
                 if not isinstance(media, dict):
                     continue
             for media in encodings:
                 if not isinstance(media, dict):
                     continue

-                media_url = media.get('location')
-                if not media_url or not isinstance(media_url, compat_str):
+                media_url = url_or_none(media.get('location'))
+                if not media_url:

                     continue
 
                 format_id_list = [format_id]
                     continue
 
                 format_id_list = [format_id]


@@ -93,4 +94,5 @@ class CamModelsIE(InfoExtractor):
             'title': self._live_title(user_id),
             'is_live': True,
             'formats': formats,
             'title': self._live_title(user_id),
             'is_live': True,
             'formats': formats,

+            'age_limit': 18

         }
         }