diff options
author | Philipp Hagemeister <phihag@phihag.de> | 2014-03-10 13:03:52 +0100 |
---|---|---|
committer | Philipp Hagemeister <phihag@phihag.de> | 2014-03-10 13:03:52 +0100 |
commit | e712d94adfa6fb9c18c6d7317510086e7b69969b (patch) | |
tree | b0ba0d65bd129d43df35d7bed236f85e78bc13c1 /youtube_dl/extractor/photobucket.py | |
parent | 6a7242395509f2aabd7046c3c71683829ba7932c (diff) | |
parent | 4126826b10b0571633c36535590d1ad7c0fa73dd (diff) |
Merge branch 'master' of github.com:rg3/youtube-dl
Diffstat (limited to 'youtube_dl/extractor/photobucket.py')
-rw-r--r-- | youtube_dl/extractor/photobucket.py | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/youtube_dl/extractor/photobucket.py b/youtube_dl/extractor/photobucket.py index 58863e382..a59953497 100644 --- a/youtube_dl/extractor/photobucket.py +++ b/youtube_dl/extractor/photobucket.py @@ -10,10 +10,10 @@ from .common import InfoExtractor class PhotobucketIE(InfoExtractor): _VALID_URL = r'http://(?:[a-z0-9]+\.)?photobucket\.com/.*(([\?\&]current=)|_)(?P<id>.*)\.(?P<ext>(flv)|(mp4))' _TEST = { - u'url': u'http://media.photobucket.com/user/rachaneronas/media/TiredofLinkBuildingTryBacklinkMyDomaincom_zpsc0c3b9fa.mp4.html?filters[term]=search&filters[primary]=videos&filters[secondary]=images&sort=1&o=0', - u'file': u'zpsc0c3b9fa.mp4', - u'md5': u'7dabfb92b0a31f6c16cebc0f8e60ff99', - u'info_dict': { + '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': { 'upload_date': '20130504', 'uploader': 'rachaneronas', 'title': 'Tired of Link Building? Try BacklinkMyDomain.com!', @@ -34,10 +34,10 @@ class PhotobucketIE(InfoExtractor): info = json.loads(info_json) return { 'id': video_id, - 'url': info[u'downloadUrl'], - 'uploader': info[u'username'], - 'upload_date': datetime.date.fromtimestamp(info[u'creationDate']).strftime('%Y%m%d'), - 'title': info[u'title'], + 'url': info['downloadUrl'], + 'uploader': info['username'], + 'upload_date': datetime.date.fromtimestamp(info['creationDate']).strftime('%Y%m%d'), + 'title': info['title'], 'ext': video_extension, - 'thumbnail': info[u'thumbUrl'], + 'thumbnail': info['thumbUrl'], } |