Update upstream source from tag 'upstream/2019.09.28'

[youtubedl] / youtube_dl / extractor / bambuser.py

diff --git a/youtube_dl/extractor/bambuser.py b/youtube_dl/extractor/bambuser.py
index da986e06350d047f9a70dc4f42bfeb27b04afd0e..4400ff9c1e1dacbad0fc128be2023717770e9fbd 100644 (file)
--- a/youtube_dl/extractor/bambuser.py
+++ b/youtube_dl/extractor/bambuser.py
@@ -4,15 +4,13 @@ import re
 import itertools
 
 from .common import InfoExtractor
 import itertools
 
 from .common import InfoExtractor

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

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

-    int_or_none,

     float_or_none,
     float_or_none,

+    int_or_none,

     sanitized_Request,
     sanitized_Request,

+    urlencode_postdata,

 )
 
 
 )
 
 


@@ -25,7 +23,7 @@ class BambuserIE(InfoExtractor):
 
     _TEST = {
         'url': 'http://bambuser.com/v/4050584',
 
     _TEST = {
         'url': 'http://bambuser.com/v/4050584',

-        # MD5 seems to be flaky, see https://travis-ci.org/rg3/youtube-dl/jobs/14051016#L388
+        # MD5 seems to be flaky, see https://travis-ci.org/ytdl-org/youtube-dl/jobs/14051016#L388

         # 'md5': 'fba8f7693e48fd4e8641b3fd5539a641',
         'info_dict': {
             'id': '4050584',
         # 'md5': 'fba8f7693e48fd4e8641b3fd5539a641',
         'info_dict': {
             'id': '4050584',


@@ -40,13 +38,13 @@ class BambuserIE(InfoExtractor):
         },
         'params': {
             # It doesn't respect the 'Range' header, it would download the whole video
         },
         'params': {
             # It doesn't respect the 'Range' header, it would download the whole video

-            # caused the travis builds to fail: https://travis-ci.org/rg3/youtube-dl/jobs/14493845#L59
+            # caused the travis builds to fail: https://travis-ci.org/ytdl-org/youtube-dl/jobs/14493845#L59

             'skip_download': True,
         },
     }
 
     def _login(self):
             'skip_download': True,
         },
     }
 
     def _login(self):

-        (username, password) = self._get_login_info()
+        username, password = self._get_login_info()

         if username is None:
             return
 
         if username is None:
             return
 


@@ -58,10 +56,10 @@ class BambuserIE(InfoExtractor):
         }
 
         request = sanitized_Request(
         }
 
         request = sanitized_Request(

-            self._LOGIN_URL, compat_urllib_parse.urlencode(login_form).encode('utf-8'))
+            self._LOGIN_URL, urlencode_postdata(login_form))

         request.add_header('Referer', self._LOGIN_URL)
         response = self._download_webpage(
         request.add_header('Referer', self._LOGIN_URL)
         response = self._download_webpage(

-            request, None, 'Logging in as %s' % username)
+            request, None, 'Logging in')

 
         login_error = self._html_search_regex(
             r'(?s)<div class="messages error">(.+?)</div>',
 
         login_error = self._html_search_regex(
             r'(?s)<div class="messages error">(.+?)</div>',