diff options
| author | Jaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com> | 2015-05-02 17:29:56 +0200 |
|---|---|---|
| committer | Jaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com> | 2015-05-02 17:29:56 +0200 |
| commit | 2ddcd88129e633ead8c5faee6c930b66dddb1b32 (patch) | |
| tree | ba6ac80f3f5f68c70fce5451806e4f850cf93663 | |
| parent | dd8920653c7249545bbcf5a690ffca702c9f29f2 (diff) | |
Remove code that was only used by the Grooveshark extractor
| -rw-r--r-- | youtube_dl/compat.py | 6 | ||||
| -rw-r--r-- | youtube_dl/downloader/http.py | 9 | ||||
| -rw-r--r-- | youtube_dl/extractor/common.py | 3 |
3 files changed, 2 insertions, 16 deletions
diff --git a/youtube_dl/compat.py b/youtube_dl/compat.py index 973bcd320..f9529210d 100644 --- a/youtube_dl/compat.py +++ b/youtube_dl/compat.py @@ -47,11 +47,6 @@ except ImportError: # Python 2 import htmlentitydefs as compat_html_entities try: - import html.parser as compat_html_parser -except ImportError: # Python 2 - import HTMLParser as compat_html_parser - -try: import http.client as compat_http_client except ImportError: # Python 2 import httplib as compat_http_client @@ -404,7 +399,6 @@ __all__ = [ 'compat_getenv', 'compat_getpass', 'compat_html_entities', - 'compat_html_parser', 'compat_http_client', 'compat_http_server', 'compat_kwargs', diff --git a/youtube_dl/downloader/http.py b/youtube_dl/downloader/http.py index d136bebd1..b7f144af9 100644 --- a/youtube_dl/downloader/http.py +++ b/youtube_dl/downloader/http.py @@ -28,13 +28,8 @@ class HttpFD(FileDownloader): add_headers = info_dict.get('http_headers') if add_headers: headers.update(add_headers) - data = info_dict.get('http_post_data') - http_method = info_dict.get('http_method') - basic_request = compat_urllib_request.Request(url, data, headers) - request = compat_urllib_request.Request(url, data, headers) - if http_method is not None: - basic_request.get_method = lambda: http_method - request.get_method = lambda: http_method + basic_request = compat_urllib_request.Request(url, None, headers) + request = compat_urllib_request.Request(url, None, headers) is_test = self.params.get('test', False) diff --git a/youtube_dl/extractor/common.py b/youtube_dl/extractor/common.py index 48f58aae3..3ae5d5212 100644 --- a/youtube_dl/extractor/common.py +++ b/youtube_dl/extractor/common.py @@ -111,11 +111,8 @@ class InfoExtractor(object): (quality takes higher priority) -1 for default (order by other properties), -2 or smaller for less than default. - * http_method HTTP method to use for the download. * http_headers A dictionary of additional HTTP headers to add to the request. - * http_post_data Additional data to send with a POST - request. * stretched_ratio If given and not 1, indicates that the video's pixels are not square. width : height ratio as float. |