From: Jaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>
Date: Fri, 16 May 2014 18:43:36 +0000 (+0200)
Subject: Merge remote-tracking branch 'codesparkle/fix-photobucket-url' (closes #2934)
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=08af0205f974c4b6c1b01c0bc0200f90cce36c48;p=youtube-dl

Merge remote-tracking branch 'codesparkle/fix-photobucket-url' (closes #2934)

Fix photobucket url extraction
---

08af0205f974c4b6c1b01c0bc0200f90cce36c48
diff --cc youtube_dl/extractor/photobucket.py
index a59953497,5337dea56..8aa69c46e
--- a/youtube_dl/extractor/photobucket.py
+++ b/youtube_dl/extractor/photobucket.py
@@@ -5,6 -4,7 +4,7 @@@ import jso
  import re
  
  from .common import InfoExtractor
 -from utils import compat_urllib_parse
++from ..utils import compat_urllib_parse
  
  
  class PhotobucketIE(InfoExtractor):
@@@ -32,11 -33,12 +33,12 @@@
          info_json = self._search_regex(r'Pb\.Data\.Shared\.put\(Pb\.Data\.Shared\.MEDIA, (.*?)\);',
              webpage, 'info json')
          info = json.loads(info_json)
 -        url = compat_urllib_parse.unquote(self._html_search_regex('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': info['downloadUrl'],
+             'url': url,
              'uploader': info['username'],
-             'upload_date': datetime.date.fromtimestamp(info['creationDate']).strftime('%Y%m%d'),
+             'timestamp': info['creationDate'],
              'title': info['title'],
              'ext': video_extension,
              'thumbnail': info['thumbUrl'],