From e28f1c0ae812293b2ebb5f052f8af2cfaede1248 Mon Sep 17 00:00:00 2001 From: pukkandan Date: Wed, 28 Apr 2021 19:59:40 +0530 Subject: [PATCH] [cleanup] Fix linter and some typos * Also remove inconsistent use of `"` in setup.py --- Changelog.md | 4 +-- setup.py | 60 ++++++++++++++++++------------------- yt_dlp/extractor/youtube.py | 4 +-- yt_dlp/update.py | 8 ++--- 4 files changed, 38 insertions(+), 38 deletions(-) diff --git a/Changelog.md b/Changelog.md index dbc8278fb..e3c3b1987 100644 --- a/Changelog.md +++ b/Changelog.md @@ -33,11 +33,11 @@ * Add option `--skip-playlist-after-errors` to skip the rest of a playlist after a given number of errors are encountered * Merge youtube-dl: Upto [commit/7e8b3f9](https://github.com/ytdl-org/youtube-dl/commit/7e8b3f9439ebefb3a3a4e5da9c0bd2b595976438) * [downloader] Fix bug in downloader selection -* [BilibiliChannel] Fix pagination by [nao20010128nao](https://github.com/nao20010128nao) and[pukkandan](https://github.com/pukkandan) +* [BilibiliChannel] Fix pagination by [nao20010128nao](https://github.com/nao20010128nao) and [pukkandan](https://github.com/pukkandan) * [rai] Add support for http formats by [nixxo](https://github.com/nixxo) * [TubiTv] Add TubiTvShowIE by [Ashish0804](https://github.com/Ashish0804) * [twitcasting] Fix extractor -* [viu:ott] Fix extractor and support series by [lkho](https://github.com/lkho) and[pukkandan](https://github.com/pukkandan) +* [viu:ott] Fix extractor and support series by [lkho](https://github.com/lkho) and [pukkandan](https://github.com/pukkandan) * [youtube:tab] Show unavailable videos in playlists by [colethedj](https://github.com/colethedj) * [youtube:tab] Reload with unavailable videos for all playlists * [youtube] Ignore invalid stretch ratio diff --git a/setup.py b/setup.py index babdc45af..cebe556c9 100644 --- a/setup.py +++ b/setup.py @@ -18,13 +18,13 @@ DESCRIPTION = 'Command-line program to download videos from YouTube.com and many LONG_DESCRIPTION = '\n\n'.join(( 'Official repository: ', '**PS**: Many links in this document will not work since this is a copy of the README.md from Github', - open("README.md", "r", encoding="utf-8").read())) + open('README.md', 'r', encoding='utf-8').read())) REQUIREMENTS = ['mutagen', 'pycryptodome'] if len(sys.argv) >= 2 and sys.argv[1] == 'py2exe': - print("inv") + print('inv') else: files_spec = [ ('share/bash-completion/completions', ['completions/bash/yt-dlp']), @@ -67,17 +67,17 @@ class build_lazy_extractors(Command): ) -packages = find_packages(exclude=("youtube_dl", "test", "ytdlp_plugins")) +packages = find_packages(exclude=('youtube_dl', 'test', 'ytdlp_plugins')) setup( - name="yt-dlp", + name='yt-dlp', version=__version__, - maintainer="pukkandan", - maintainer_email="pukkandan.ytdlp@gmail.com", + maintainer='pukkandan', + maintainer_email='pukkandan.ytdlp@gmail.com', description=DESCRIPTION, long_description=LONG_DESCRIPTION, - long_description_content_type="text/markdown", - url="https://github.com/yt-dlp/yt-dlp", + long_description_content_type='text/markdown', + url='https://github.com/yt-dlp/yt-dlp', packages=packages, install_requires=REQUIREMENTS, project_urls={ @@ -87,28 +87,28 @@ setup( #'Funding': 'https://donate.pypi.org', }, classifiers=[ - "Topic :: Multimedia :: Video", - "Development Status :: 5 - Production/Stable", - "Environment :: Console", - "Programming Language :: Python", - "Programming Language :: Python :: 2", - "Programming Language :: Python :: 2.6", - "Programming Language :: Python :: 2.7", - "Programming Language :: Python :: 3", - "Programming Language :: Python :: 3.2", - "Programming Language :: Python :: 3.3", - "Programming Language :: Python :: 3.4", - "Programming Language :: Python :: 3.5", - "Programming Language :: Python :: 3.6", - "Programming Language :: Python :: 3.7", - "Programming Language :: Python :: 3.8", - "Programming Language :: Python :: Implementation", - "Programming Language :: Python :: Implementation :: CPython", - "Programming Language :: Python :: Implementation :: IronPython", - "Programming Language :: Python :: Implementation :: Jython", - "Programming Language :: Python :: Implementation :: PyPy", - "License :: Public Domain", - "Operating System :: OS Independent", + 'Topic :: Multimedia :: Video', + 'Development Status :: 5 - Production/Stable', + 'Environment :: Console', + 'Programming Language :: Python', + 'Programming Language :: Python :: 2', + 'Programming Language :: Python :: 2.6', + 'Programming Language :: Python :: 2.7', + 'Programming Language :: Python :: 3', + 'Programming Language :: Python :: 3.2', + 'Programming Language :: Python :: 3.3', + 'Programming Language :: Python :: 3.4', + 'Programming Language :: Python :: 3.5', + 'Programming Language :: Python :: 3.6', + 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.8', + 'Programming Language :: Python :: Implementation', + 'Programming Language :: Python :: Implementation :: CPython', + 'Programming Language :: Python :: Implementation :: IronPython', + 'Programming Language :: Python :: Implementation :: Jython', + 'Programming Language :: Python :: Implementation :: PyPy', + 'License :: Public Domain', + 'Operating System :: OS Independent', ], python_requires='>=2.6', diff --git a/yt_dlp/extractor/youtube.py b/yt_dlp/extractor/youtube.py index c781c23fc..577f50f09 100644 --- a/yt_dlp/extractor/youtube.py +++ b/yt_dlp/extractor/youtube.py @@ -2969,8 +2969,8 @@ class YoutubeTabIE(YoutubeBaseInfoExtractor): post_renderer, lambda x: x['backstageAttachment']['playlistRenderer']['playlistId'], compat_str) if playlist_id: yield self.url_result( - 'https://www.youtube.com/playlist?list=%s' % playlist_id, - ie=YoutubeTabIE.ie_key(), video_id=playlist_id) + 'https://www.youtube.com/playlist?list=%s' % playlist_id, + ie=YoutubeTabIE.ie_key(), video_id=playlist_id) # inline video links runs = try_get(post_renderer, lambda x: x['contentText']['runs'], list) or [] for run in runs: diff --git a/yt_dlp/update.py b/yt_dlp/update.py index c773e2721..67b112f6e 100644 --- a/yt_dlp/update.py +++ b/yt_dlp/update.py @@ -50,7 +50,7 @@ def update_self(to_screen, verbose, opener): return h.hexdigest() if not isinstance(globals().get('__loader__'), zipimporter) and not hasattr(sys, 'frozen'): - to_screen('It looks like you installed yt-dlp with a package manager, pip, setup.py or a tarball. Please use that to update.') + to_screen('It looks like you installed yt-dlp with a package manager, pip, setup.py or a tarball. Please use that to update') return # sys.executable is set to the full pathname of the exe-file for py2exe @@ -66,7 +66,7 @@ def update_self(to_screen, verbose, opener): except Exception: if verbose: to_screen(encode_compat_str(traceback.format_exc())) - to_screen('ERROR: can\'t obtain versions info. Please try again later.') + to_screen('ERROR: can\'t obtain versions info. Please try again later') to_screen('Visit https://github.com/yt-dlp/yt-dlp/releases/latest') return @@ -165,7 +165,7 @@ def update_self(to_screen, verbose, opener): echo.Waiting for file handle to be closed ... ping 127.0.0.1 -n 5 -w 1000 > NUL move /Y "%s.new" "%s" > NUL - echo.Updated yt-dlp to version %s. + echo.Updated yt-dlp to version %s ) @start /b "" cmd /c del "%%~f0"&exit /b ''' % (exe, exe, version_id)) @@ -212,7 +212,7 @@ def update_self(to_screen, verbose, opener): to_screen('ERROR: unable to overwrite current version') return - to_screen('Updated yt-dlp. Restart yt-dlp to use the new version.') + to_screen('Updated yt-dlp. Restart yt-dlp to use the new version') ''' # UNUSED