Imported Upstream version 2015.05.15

[youtubedl] / youtube_dl / extractor / myvideo.py

diff --git a/youtube_dl/extractor/myvideo.py b/youtube_dl/extractor/myvideo.py
index ccb5959c4046e73f1263ecee19e829b418c6d506..5e754fcffb6403cbd359b9b358ad3879ef279f53 100644 (file)
--- a/youtube_dl/extractor/myvideo.py
+++ b/youtube_dl/extractor/myvideo.py
@@ -7,11 +7,12 @@ import re
 import json
 
 from .common import InfoExtractor
 import json
 
 from .common import InfoExtractor

-from ..utils import (
+from ..compat import (

     compat_ord,
     compat_urllib_parse,
     compat_urllib_request,
     compat_ord,
     compat_urllib_parse,
     compat_urllib_request,

-
+)
+from ..utils import (

     ExtractorError,
 )
 
     ExtractorError,
 )
 


@@ -32,7 +33,7 @@ class MyVideoIE(InfoExtractor):
     # Original Code from: https://github.com/dersphere/plugin.video.myvideo_de.git
     # Released into the Public Domain by Tristan Fischer on 2013-05-19
     # https://github.com/rg3/youtube-dl/pull/842
     # Original Code from: https://github.com/dersphere/plugin.video.myvideo_de.git
     # Released into the Public Domain by Tristan Fischer on 2013-05-19
     # https://github.com/rg3/youtube-dl/pull/842

-    def __rc4crypt(self,data, key):
+    def __rc4crypt(self, data, key):

         x = 0
         box = list(range(256))
         for i in list(range(256)):
         x = 0
         box = list(range(256))
         for i in list(range(256)):


@@ -48,17 +49,17 @@ class MyVideoIE(InfoExtractor):
             out += chr(compat_ord(char) ^ box[(box[x] + box[y]) % 256])
         return out
 
             out += chr(compat_ord(char) ^ box[(box[x] + box[y]) % 256])
         return out
 

-    def __md5(self,s):
+    def __md5(self, s):

         return hashlib.md5(s).hexdigest().encode()
 
         return hashlib.md5(s).hexdigest().encode()
 

-    def _real_extract(self,url):
+    def _real_extract(self, url):

         mobj = re.match(self._VALID_URL, url)
         video_id = mobj.group('id')
 
         GK = (
         mobj = re.match(self._VALID_URL, url)
         video_id = mobj.group('id')
 
         GK = (

-          b'WXpnME1EZGhNRGhpTTJNM01XVmhOREU0WldNNVpHTTJOakpt'
-          b'TW1FMU5tVTBNR05pWkRaa05XRXhNVFJoWVRVd1ptSXhaVEV3'
-          b'TnpsbA0KTVRkbU1tSTRNdz09'
+            b'WXpnME1EZGhNRGhpTTJNM01XVmhOREU0WldNNVpHTTJOakpt'
+            b'TW1FMU5tVTBNR05pWkRaa05XRXhNVFJoWVRVd1ptSXhaVEV3'
+            b'TnpsbA0KTVRkbU1tSTRNdz09'

         )
 
         # Get video webpage
         )
 
         # Get video webpage


@@ -71,7 +72,7 @@ class MyVideoIE(InfoExtractor):
             video_url = mobj.group(1) + '.flv'
 
             video_title = self._html_search_regex('<title>([^<]+)</title>',
             video_url = mobj.group(1) + '.flv'
 
             video_title = self._html_search_regex('<title>([^<]+)</title>',

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

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


@@ -161,7 +162,7 @@ class MyVideoIE(InfoExtractor):
         video_swfobj = compat_urllib_parse.unquote(video_swfobj)
 
         video_title = self._html_search_regex("<h1(?: class='globalHd')?>(.*?)</h1>",
         video_swfobj = compat_urllib_parse.unquote(video_swfobj)
 
         video_title = self._html_search_regex("<h1(?: class='globalHd')?>(.*?)</h1>",

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

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


@@ -172,4 +173,3 @@ class MyVideoIE(InfoExtractor):
             'play_path': video_playpath,
             'player_url': video_swfobj,
         }
             'play_path': video_playpath,
             'player_url': video_swfobj,
         }

-