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;hp=a725fb1f4329a436e32019645299c11fa080ed74;p=youtube-dl

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

Fix photobucket url extraction
---

diff --git a/youtube_dl/extractor/photobucket.py b/youtube_dl/extractor/photobucket.py
index 5337dea56..8aa69c46e 100644
--- a/youtube_dl/extractor/photobucket.py
+++ b/youtube_dl/extractor/photobucket.py
@@ -4,7 +4,7 @@ import json
 import re
 
 from .common import InfoExtractor
-from utils import compat_urllib_parse
+from ..utils import compat_urllib_parse
 
 
 class PhotobucketIE(InfoExtractor):
@@ -33,7 +33,7 @@ class PhotobucketIE(InfoExtractor):
         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': url,