renaming issues resolved

pull/8/head
Unknown 4 years ago
parent 58ac65e7ed
commit 3867038a06

@ -1388,8 +1388,8 @@ Line 1
self.assertEqual(caesar('ebg', 'acegik', -2), 'abc') self.assertEqual(caesar('ebg', 'acegik', -2), 'abc')
def test_rot47(self): def test_rot47(self):
self.assertEqual(rot47('youtube-dlc'), r'J@FEF36\5=') self.assertEqual(rot47('youtube-dlc'), r'J@FEF36\5=4')
self.assertEqual(rot47('youtube-dlc'), r'*~&%&qt\s{') self.assertEqual(rot47('youtube-dlc'), r'*~&%&qt\s{r')
def test_urshift(self): def test_urshift(self):
self.assertEqual(urshift(3, 1), 1) self.assertEqual(urshift(3, 1), 1)

@ -287,7 +287,7 @@ class VimeoIE(VimeoBaseInfoExtractor):
'info_dict': { 'info_dict': {
'id': '56015672', 'id': '56015672',
'ext': 'mp4', 'ext': 'mp4',
'title': "youtube-dlc test video - \u2605 \" ' \u5e78 / \\ \u00e4 \u21ad \U0001d550", 'title': "youtube-dl test video - \u2605 \" ' \u5e78 / \\ \u00e4 \u21ad \U0001d550",
'description': 'md5:2d3305bad981a06ff79f027f19865021', 'description': 'md5:2d3305bad981a06ff79f027f19865021',
'timestamp': 1355990239, 'timestamp': 1355990239,
'upload_date': '20121220', 'upload_date': '20121220',
@ -347,7 +347,7 @@ class VimeoIE(VimeoBaseInfoExtractor):
'info_dict': { 'info_dict': {
'id': '68375962', 'id': '68375962',
'ext': 'mp4', 'ext': 'mp4',
'title': 'youtube-dlc password protected test video', 'title': 'youtube-dl password protected test video',
'timestamp': 1371200155, 'timestamp': 1371200155,
'upload_date': '20130614', 'upload_date': '20130614',
'uploader_url': r're:https?://(?:www\.)?vimeo\.com/user18948128', 'uploader_url': r're:https?://(?:www\.)?vimeo\.com/user18948128',
@ -358,7 +358,7 @@ class VimeoIE(VimeoBaseInfoExtractor):
}, },
'params': { 'params': {
'format': 'best[protocol=https]', 'format': 'best[protocol=https]',
'videopassword': 'youtube-dlc', 'videopassword': 'youtube-dl',
}, },
}, },
{ {
@ -473,7 +473,7 @@ class VimeoIE(VimeoBaseInfoExtractor):
'info_dict': { 'info_dict': {
'id': '68375962', 'id': '68375962',
'ext': 'mp4', 'ext': 'mp4',
'title': 'youtube-dlc password protected test video', 'title': 'youtube-dl password protected test video',
'uploader_url': r're:https?://(?:www\.)?vimeo\.com/user18948128', 'uploader_url': r're:https?://(?:www\.)?vimeo\.com/user18948128',
'uploader_id': 'user18948128', 'uploader_id': 'user18948128',
'uploader': 'Jaime Marquínez Ferrándiz', 'uploader': 'Jaime Marquínez Ferrándiz',
@ -481,7 +481,7 @@ class VimeoIE(VimeoBaseInfoExtractor):
}, },
'params': { 'params': {
'format': 'best[protocol=https]', 'format': 'best[protocol=https]',
'videopassword': 'youtube-dlc', 'videopassword': 'youtube-dl',
}, },
}, },
{ {
@ -917,7 +917,7 @@ class VimeoAlbumIE(VimeoBaseInfoExtractor):
}, },
'playlist_count': 1, 'playlist_count': 1,
'params': { 'params': {
'videopassword': 'youtube-dlc', 'videopassword': 'youtube-dl',
} }
}] }]
_PAGE_SIZE = 100 _PAGE_SIZE = 100

@ -560,16 +560,16 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
'info_dict': { 'info_dict': {
'id': 'BaW_jenozKc', 'id': 'BaW_jenozKc',
'ext': 'mp4', 'ext': 'mp4',
'title': 'youtube-dlc test video "\'/\\ä↭𝕐', 'title': 'youtube-dl test video "\'/\\ä↭𝕐',
'uploader': 'Philipp Hagemeister', 'uploader': 'Philipp Hagemeister',
'uploader_id': 'phihag', 'uploader_id': 'phihag',
'uploader_url': r're:https?://(?:www\.)?youtube\.com/user/phihag', 'uploader_url': r're:https?://(?:www\.)?youtube\.com/user/phihag',
'channel_id': 'UCLqxVugv74EIW3VWh2NOa3Q', 'channel_id': 'UCLqxVugv74EIW3VWh2NOa3Q',
'channel_url': r're:https?://(?:www\.)?youtube\.com/channel/UCLqxVugv74EIW3VWh2NOa3Q', 'channel_url': r're:https?://(?:www\.)?youtube\.com/channel/UCLqxVugv74EIW3VWh2NOa3Q',
'upload_date': '20121002', 'upload_date': '20121002',
'description': 'test chars: "\'/\\ä↭𝕐\ntest URL: https://github.com/rg3/youtube-dl/issues/1892\n\nThis is a test video for youtube-dlc.\n\nFor more information, contact phihag@phihag.de .', 'description': 'test chars: "\'/\\ä↭𝕐\ntest URL: https://github.com/rg3/youtube-dl/issues/1892\n\nThis is a test video for youtube-dl.\n\nFor more information, contact phihag@phihag.de .',
'categories': ['Science & Technology'], 'categories': ['Science & Technology'],
'tags': ['youtube-dlc'], 'tags': ['youtube-dl'],
'duration': 10, 'duration': 10,
'view_count': int, 'view_count': int,
'like_count': int, 'like_count': int,
@ -641,14 +641,14 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
'info_dict': { 'info_dict': {
'id': 'BaW_jenozKc', 'id': 'BaW_jenozKc',
'ext': 'mp4', 'ext': 'mp4',
'title': 'youtube-dlc test video "\'/\\ä↭𝕐', 'title': 'youtube-dl test video "\'/\\ä↭𝕐',
'uploader': 'Philipp Hagemeister', 'uploader': 'Philipp Hagemeister',
'uploader_id': 'phihag', 'uploader_id': 'phihag',
'uploader_url': r're:https?://(?:www\.)?youtube\.com/user/phihag', 'uploader_url': r're:https?://(?:www\.)?youtube\.com/user/phihag',
'upload_date': '20121002', 'upload_date': '20121002',
'description': 'test chars: "\'/\\ä↭𝕐\ntest URL: https://github.com/rg3/youtube-dl/issues/1892\n\nThis is a test video for youtube-dlc.\n\nFor more information, contact phihag@phihag.de .', 'description': 'test chars: "\'/\\ä↭𝕐\ntest URL: https://github.com/rg3/youtube-dl/issues/1892\n\nThis is a test video for youtube-dl.\n\nFor more information, contact phihag@phihag.de .',
'categories': ['Science & Technology'], 'categories': ['Science & Technology'],
'tags': ['youtube-dlc'], 'tags': ['youtube-dl'],
'duration': 10, 'duration': 10,
'view_count': int, 'view_count': int,
'like_count': int, 'like_count': int,
@ -2600,7 +2600,7 @@ class YoutubePlaylistIE(YoutubePlaylistBaseInfoExtractor):
'uploader_id': 'UCmlqkdCBesrv2Lak1mF_MxA', 'uploader_id': 'UCmlqkdCBesrv2Lak1mF_MxA',
'uploader': 'Sergey M.', 'uploader': 'Sergey M.',
'id': 'PL4lCao7KL_QFVb7Iudeipvc2BCavECqzc', 'id': 'PL4lCao7KL_QFVb7Iudeipvc2BCavECqzc',
'title': 'youtube-dlc public playlist', 'title': 'youtube-dl public playlist',
}, },
'playlist_count': 1, 'playlist_count': 1,
}, { }, {
@ -2609,7 +2609,7 @@ class YoutubePlaylistIE(YoutubePlaylistBaseInfoExtractor):
'uploader_id': 'UCmlqkdCBesrv2Lak1mF_MxA', 'uploader_id': 'UCmlqkdCBesrv2Lak1mF_MxA',
'uploader': 'Sergey M.', 'uploader': 'Sergey M.',
'id': 'PL4lCao7KL_QFodcLWhDpGCYnngnHtQ-Xf', 'id': 'PL4lCao7KL_QFodcLWhDpGCYnngnHtQ-Xf',
'title': 'youtube-dlc empty playlist', 'title': 'youtube-dl empty playlist',
}, },
'playlist_count': 0, 'playlist_count': 0,
}, { }, {
@ -3235,10 +3235,10 @@ class YoutubeSearchURLIE(YoutubeSearchBaseInfoExtractor):
IE_NAME = 'youtube:search_url' IE_NAME = 'youtube:search_url'
_VALID_URL = r'https?://(?:www\.)?youtube\.com/results\?(.*?&)?(?:search_query|q)=(?P<query>[^&]+)(?:[&]|$)' _VALID_URL = r'https?://(?:www\.)?youtube\.com/results\?(.*?&)?(?:search_query|q)=(?P<query>[^&]+)(?:[&]|$)'
_TESTS = [{ _TESTS = [{
'url': 'https://www.youtube.com/results?baz=bar&search_query=youtube-dlc+test+video&filters=video&lclk=video', 'url': 'https://www.youtube.com/results?baz=bar&search_query=youtube-dl+test+video&filters=video&lclk=video',
'playlist_mincount': 5, 'playlist_mincount': 5,
'info_dict': { 'info_dict': {
'title': 'youtube-dlc test video', 'title': 'youtube-dl test video',
} }
}, { }, {
'url': 'https://www.youtube.com/results?q=test&sp=EgQIBBgB', 'url': 'https://www.youtube.com/results?q=test&sp=EgQIBBgB',
@ -3422,9 +3422,9 @@ class YoutubeTruncatedURLIE(InfoExtractor):
raise ExtractorError( raise ExtractorError(
'Did you forget to quote the URL? Remember that & is a meta ' 'Did you forget to quote the URL? Remember that & is a meta '
'character in most shells, so you want to put the URL in quotes, ' 'character in most shells, so you want to put the URL in quotes, '
'like youtube-dlc ' 'like youtube-dl '
'"https://www.youtube.com/watch?feature=foo&v=BaW_jenozKc" ' '"https://www.youtube.com/watch?feature=foo&v=BaW_jenozKc" '
' or simply youtube-dlc BaW_jenozKc .', ' or simply youtube-dl BaW_jenozKc .',
expected=True) expected=True)

@ -1,3 +1,3 @@
from __future__ import unicode_literals from __future__ import unicode_literals
__version__ = '2020.09.02-dev1' __version__ = '2020.09.02-dev2'

Loading…
Cancel
Save