diff options
| author | Filippo Valsorda <filippo.valsorda@gmail.com> | 2013-10-01 11:58:13 -0400 |
|---|---|---|
| committer | Filippo Valsorda <filippo.valsorda@gmail.com> | 2013-10-01 11:58:13 -0400 |
| commit | 7c61bd36bb172485815288d44e00acb676e8eaff (patch) | |
| tree | dd39f2790e739e85ffca4b98e3eb1235502e21d1 | |
| parent | d4d9920a2630ef6c44cffa1b923e41291b44b5f0 (diff) | |
| download | youtube-dl-7c61bd36bb172485815288d44e00acb676e8eaff.zip youtube-dl-7c61bd36bb172485815288d44e00acb676e8eaff.tar.gz youtube-dl-7c61bd36bb172485815288d44e00acb676e8eaff.tar.bz2 | |
[youtube] correct --no-playlist for python3
| -rw-r--r-- | test/test_youtube_lists.py | 1 | ||||
| -rw-r--r-- | youtube_dl/extractor/youtube.py | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/test/test_youtube_lists.py b/test/test_youtube_lists.py index f28fe78..53e6581 100644 --- a/test/test_youtube_lists.py +++ b/test/test_youtube_lists.py @@ -33,6 +33,7 @@ class TestYoutubeLists(unittest.TestCase): ie = YoutubePlaylistIE(dl) result = ie.extract('https://www.youtube.com/watch?v=FXxLjLQi3Fg&list=PLwiyx1dc3P2JR9N8gQaQN_BCvlSlap7re') self.assertEqual(result['_type'], 'url') + self.assertEqual(YoutubeIE()._extract_id(result['url']), 'FXxLjLQi3Fg') def test_issue_673(self): dl = FakeYDL() diff --git a/youtube_dl/extractor/youtube.py b/youtube_dl/extractor/youtube.py index c6876c6..5d932f8 100644 --- a/youtube_dl/extractor/youtube.py +++ b/youtube_dl/extractor/youtube.py @@ -13,7 +13,6 @@ import struct import traceback import xml.etree.ElementTree import zlib -import urlparse from .common import InfoExtractor, SearchInfoExtractor from .subtitles import SubtitlesInfoExtractor @@ -24,6 +23,7 @@ from ..utils import ( compat_urllib_error, compat_urllib_parse, compat_urllib_request, + compat_urlparse, compat_str, clean_html, @@ -1527,7 +1527,7 @@ class YoutubePlaylistIE(InfoExtractor): playlist_id = mobj.group(1) or mobj.group(2) # Check if it's a video-specific URL - query_dict = urlparse.parse_qs(urlparse.urlparse(url).query) + query_dict = compat_urlparse.parse_qs(compat_urlparse.urlparse(url).query) if 'v' in query_dict: video_id = query_dict['v'][0] if self._downloader.params.get('noplaylist'): |