diff options
| author | Sergey M․ <dstftw@gmail.com> | 2017-11-18 19:02:56 +0700 |
|---|---|---|
| committer | Sergey M․ <dstftw@gmail.com> | 2017-11-18 19:04:56 +0700 |
| commit | f610dbb05f8d17cc95437958835a437c3777b38c (patch) | |
| tree | 58122b0d978e4a6d69aafec7e671e58a9ed9514b | |
| parent | 38db52adf35c2134444e5b6b601e9567797e9195 (diff) | |
| download | youtube-dl-f610dbb05f8d17cc95437958835a437c3777b38c.tar.xz | |
[extractor/common] Use final URL when dumping request (closes #14769)
| -rw-r--r-- | youtube_dl/extractor/common.py | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/youtube_dl/extractor/common.py b/youtube_dl/extractor/common.py index a9d68fc0c..8e4ee0deb 100644 --- a/youtube_dl/extractor/common.py +++ b/youtube_dl/extractor/common.py @@ -592,19 +592,11 @@ class InfoExtractor(object): if not encoding: encoding = self._guess_encoding_from_content(content_type, webpage_bytes) if self._downloader.params.get('dump_intermediate_pages', False): - try: - url = url_or_request.get_full_url() - except AttributeError: - url = url_or_request - self.to_screen('Dumping request to ' + url) + self.to_screen('Dumping request to ' + urlh.geturl()) dump = base64.b64encode(webpage_bytes).decode('ascii') self._downloader.to_screen(dump) if self._downloader.params.get('write_pages', False): - try: - url = url_or_request.get_full_url() - except AttributeError: - url = url_or_request - basen = '%s_%s' % (video_id, url) + basen = '%s_%s' % (video_id, urlh.geturl()) if len(basen) > 240: h = '___' + hashlib.md5(basen.encode('utf-8')).hexdigest() basen = basen[:240 - len(h)] + h |