New upstream version 2017.10.15.1

[youtubedl] / youtube_dl / extractor / photobucket.py

diff --git a/youtube_dl/extractor/photobucket.py b/youtube_dl/extractor/photobucket.py
index 8aa69c46eb75e9ccfe6fab5b7bff2c9a5778009e..6c8bbe1d95c3c4972baa4c956ad1a62ef6518e2d 100644 (file)
--- a/youtube_dl/extractor/photobucket.py
+++ b/youtube_dl/extractor/photobucket.py
@@ -4,16 +4,17 @@ import json
 import re
 
 from .common import InfoExtractor
 import re
 
 from .common import InfoExtractor

-from ..utils import compat_urllib_parse
+from ..compat import compat_urllib_parse_unquote

 
 
 class PhotobucketIE(InfoExtractor):
 
 
 class PhotobucketIE(InfoExtractor):

-    _VALID_URL = r'http://(?:[a-z0-9]+\.)?photobucket\.com/.*(([\?\&]current=)|_)(?P<id>.*)\.(?P<ext>(flv)|(mp4))'
+    _VALID_URL = r'https?://(?:[a-z0-9]+\.)?photobucket\.com/.*(([\?\&]current=)|_)(?P<id>.*)\.(?P<ext>(flv)|(mp4))'

     _TEST = {
         'url': 'http://media.photobucket.com/user/rachaneronas/media/TiredofLinkBuildingTryBacklinkMyDomaincom_zpsc0c3b9fa.mp4.html?filters[term]=search&filters[primary]=videos&filters[secondary]=images&sort=1&o=0',
     _TEST = {
         'url': 'http://media.photobucket.com/user/rachaneronas/media/TiredofLinkBuildingTryBacklinkMyDomaincom_zpsc0c3b9fa.mp4.html?filters[term]=search&filters[primary]=videos&filters[secondary]=images&sort=1&o=0',

-        'file': 'zpsc0c3b9fa.mp4',

         'md5': '7dabfb92b0a31f6c16cebc0f8e60ff99',
         'info_dict': {
         'md5': '7dabfb92b0a31f6c16cebc0f8e60ff99',
         'info_dict': {

+            'id': 'zpsc0c3b9fa',
+            'ext': 'mp4',

             'timestamp': 1367669341,
             'upload_date': '20130504',
             'uploader': 'rachaneronas',
             'timestamp': 1367669341,
             'upload_date': '20130504',
             'uploader': 'rachaneronas',


@@ -31,9 +32,9 @@ class PhotobucketIE(InfoExtractor):
         # Extract URL, uploader, and title from webpage
         self.report_extraction(video_id)
         info_json = self._search_regex(r'Pb\.Data\.Shared\.put\(Pb\.Data\.Shared\.MEDIA, (.*?)\);',
         # Extract URL, uploader, and title from webpage
         self.report_extraction(video_id)
         info_json = self._search_regex(r'Pb\.Data\.Shared\.put\(Pb\.Data\.Shared\.MEDIA, (.*?)\);',

-            webpage, 'info json')
+                                       webpage, 'info json')

         info = json.loads(info_json)
         info = json.loads(info_json)

-        url = compat_urllib_parse.unquote(self._html_search_regex(r'file=(.+\.mp4)', info['linkcodes']['html'], 'url'))
+        url = compat_urllib_parse_unquote(self._html_search_regex(r'file=(.+\.mp4)', info['linkcodes']['html'], 'url'))

         return {
             'id': video_id,
             'url': url,
         return {
             'id': video_id,
             'url': url,