Merge tag 'upstream/2016.06.25'

[youtubedl] / youtube_dl / extractor / moevideo.py

diff --git a/youtube_dl/extractor/moevideo.py b/youtube_dl/extractor/moevideo.py
index 2ff79b9b88590e87f1aecf9fdfd32f242bd98420..978d5d5bfeaf5ff64b7279343876a3177c43339a 100644 (file)
--- a/youtube_dl/extractor/moevideo.py
+++ b/youtube_dl/extractor/moevideo.py
@@ -7,9 +7,9 @@ import re
 from .common import InfoExtractor
 from ..utils import (
     ExtractorError,
 from .common import InfoExtractor
 from ..utils import (
     ExtractorError,

-    compat_urllib_parse,
-    compat_urllib_request,

     int_or_none,
     int_or_none,

+    sanitized_Request,
+    urlencode_postdata,

 )
 
 
 )
 
 


@@ -50,7 +50,8 @@ class MoeVideoIE(InfoExtractor):
                 'height': 296,
                 'duration': 6027,
                 'filesize': 588257923,
                 'height': 296,
                 'duration': 6027,
                 'filesize': 588257923,

-            }
+            },
+            'skip': 'Video has been removed',

         },
     ]
 
         },
     ]
 


@@ -76,8 +77,8 @@ class MoeVideoIE(InfoExtractor):
             ],
         ]
         r_json = json.dumps(r)
             ],
         ]
         r_json = json.dumps(r)

-        post = compat_urllib_parse.urlencode({'r': r_json})
-        req = compat_urllib_request.Request(self._API_URL, post)
+        post = urlencode_postdata({'r': r_json})
+        req = sanitized_Request(self._API_URL, post)

         req.add_header('Content-type', 'application/x-www-form-urlencoded')
 
         response = self._download_json(req, video_id)
         req.add_header('Content-type', 'application/x-www-form-urlencoded')
 
         response = self._download_json(req, video_id)