Merge tag 'upstream/2014.02.17'

[youtubedl] / youtube_dl / extractor / auengine.py

diff --git a/youtube_dl/extractor/auengine.py b/youtube_dl/extractor/auengine.py
index bcccc0b7a54c8b03b84a3e1303672509577faa66..c6f30e62616c09f50f8826d4d30cc6069cf3367f 100644 (file)
--- a/youtube_dl/extractor/auengine.py
+++ b/youtube_dl/extractor/auengine.py
@@ -1,3 +1,5 @@
+from __future__ import unicode_literals
+

 import re
 
 from .common import InfoExtractor
 import re
 
 from .common import InfoExtractor


@@ -7,13 +9,14 @@ from ..utils import (
     ExtractorError,
 )
 
     ExtractorError,
 )
 

+

 class AUEngineIE(InfoExtractor):
     _TEST = {
 class AUEngineIE(InfoExtractor):
     _TEST = {

-        u'url': u'http://auengine.com/embed.php?file=lfvlytY6&w=650&h=370',
-        u'file': u'lfvlytY6.mp4',
-        u'md5': u'48972bdbcf1a3a2f5533e62425b41d4f',
-        u'info_dict': {
-            u"title": u"[Commie]The Legend of the Legendary Heroes - 03 - Replication Eye (Alpha Stigma)[F9410F5A]"
+        'url': 'http://auengine.com/embed.php?file=lfvlytY6&w=650&h=370',
+        'file': 'lfvlytY6.mp4',
+        'md5': '48972bdbcf1a3a2f5533e62425b41d4f',
+        'info_dict': {
+            'title': '[Commie]The Legend of the Legendary Heroes - 03 - Replication Eye (Alpha Stigma)[F9410F5A]'

         }
     }
     _VALID_URL = r'(?:http://)?(?:www\.)?auengine\.com/embed\.php\?.*?file=([^&]+).*?'
         }
     }
     _VALID_URL = r'(?:http://)?(?:www\.)?auengine\.com/embed\.php\?.*?file=([^&]+).*?'


@@ -23,7 +26,7 @@ class AUEngineIE(InfoExtractor):
         video_id = mobj.group(1)
         webpage = self._download_webpage(url, video_id)
         title = self._html_search_regex(r'<title>(?P<title>.+?)</title>',
         video_id = mobj.group(1)
         webpage = self._download_webpage(url, video_id)
         title = self._html_search_regex(r'<title>(?P<title>.+?)</title>',

-                webpage, u'title')
+                webpage, 'title')

         title = title.strip()
         links = re.findall(r'\s(?:file|url):\s*["\']([^\'"]+)["\']', webpage)
         links = map(compat_urllib_parse.unquote, links)
         title = title.strip()
         links = re.findall(r'\s(?:file|url):\s*["\']([^\'"]+)["\']', webpage)
         links = map(compat_urllib_parse.unquote, links)


@@ -37,7 +40,7 @@ class AUEngineIE(InfoExtractor):
                 video_url = link
         if not video_url:
             raise ExtractorError(u'Could not find video URL')
                 video_url = link
         if not video_url:
             raise ExtractorError(u'Could not find video URL')

-        ext = u'.' + determine_ext(video_url)
+        ext = '.' + determine_ext(video_url)

         if ext == title[-len(ext):]:
             title = title[:-len(ext)]
 
         if ext == title[-len(ext):]:
             title = title[:-len(ext)]