[cleanup] Misc

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 915fecb4949620fc0ef470d7bffe950541aae961..ec95903d65ecab0aba509acb9704541eab3500e2 100644 (file)
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,3 +1,18 @@
+### Description of your *pull request* and other information
+
+</details>
+
+<!--
+
+Explanation of your *pull request* in arbitrary form goes here. Please **make sure the description explains the purpose and effect** of your *pull request* and is worded well enough to be understood. Provide as much **context and examples** as possible
+
+-->
+
+ADD DESCRIPTION HERE
+
+Fixes #
+
+
 <details open><summary>Template</summary> <!-- OPEN is intentional -->
 
 <!--
@@ -24,17 +39,3 @@ ### What is the purpose of your *pull request*?
 - [ ] New extractor ([Piracy websites will not be accepted](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#is-the-website-primarily-used-for-piracy))
 - [ ] Core bug fix/improvement
 - [ ] New feature (It is strongly [recommended to open an issue first](https://github.com/yt-dlp/yt-dlp/blob/master/CONTRIBUTING.md#adding-new-feature-or-making-overarching-changes))
-
-### Description of your *pull request* and other information
-
-</details>
-
-<!--
-
-Explanation of your *pull request* in arbitrary form goes here. Please **make sure the description explains the purpose and effect** of your *pull request* and is worded well enough to be understood. Provide as much **context and examples** as possible
-
--->
-
-DESCRIPTION
-
-Fixes #

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 03681d30c1be77c11b6c582196e2f01995bb61f2..6d9546033c851dbd2c793e18f101e86530041e62 100644 (file)
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -222,7 +222,7 @@ ## Adding support for a new site
 
         $ flake8 yt_dlp/extractor/yourextractor.py
 
-1. Make sure your code works under all [Python](https://www.python.org/) versions supported by yt-dlp, namely CPython and PyPy for Python 3.6 and above. Backward compatibility is not required for even older versions of Python.
+1. Make sure your code works under all [Python](https://www.python.org/) versions supported by yt-dlp, namely CPython and PyPy for Python 3.7 and above. Backward compatibility is not required for even older versions of Python.
 1. When the tests pass, [add](https://git-scm.com/docs/git-add) the new files, [commit](https://git-scm.com/docs/git-commit) them and [push](https://git-scm.com/docs/git-push) the result, like this:
 
         $ git add yt_dlp/extractor/_extractors.py

diff --git a/setup.cfg b/setup.cfg
index 415cca91a8c56b9f9a8bee31b4950b838f7d793f..d33c7d854958582f57ba27e45ae96f1a92e60ea4 100644 (file)
--- a/setup.cfg
+++ b/setup.cfg
@@ -31,7 +31,7 @@ setenv =
 
 
 [isort]
-py_version = 36
+py_version = 37
 multi_line_output = VERTICAL_HANGING_INDENT
 line_length = 80
 reverse_relative = true

diff --git a/yt_dlp/dependencies.py b/yt_dlp/dependencies.py
index a68babb3148072a64cc738249c5dacfd226bf18f..5a5363adb1eb29494b3e91a20f038af7a1a913d3 100644 (file)
--- a/yt_dlp/dependencies.py
+++ b/yt_dlp/dependencies.py
@@ -28,7 +28,7 @@
 except ImportError:
     try:
         from Crypto.Cipher import AES as Cryptodome_AES
-    except ImportError:
+    except (ImportError, SyntaxError):  # Old Crypto gives SyntaxError in newer Python
         Cryptodome_AES = None
     else:
         try:

diff --git a/yt_dlp/extractor/minds.py b/yt_dlp/extractor/minds.py
index 8079bbb3986dc4f513acde99d88183b6c6b9f514..85dd5fd79a564cefce2aa28a7cc06c5d69bffe26 100644 (file)
--- a/yt_dlp/extractor/minds.py
+++ b/yt_dlp/extractor/minds.py
@@ -76,7 +76,7 @@ def _real_extract(self, url):
             else:
                 return self.url_result(entity['perma_url'])
         else:
-            assert(entity['subtype'] == 'video')
+            assert entity['subtype'] == 'video'
             video_id = entity_id
         # 1080p and webm formats available only on the sources array
         video = self._call_api(

diff --git a/yt_dlp/extractor/youtube.py b/yt_dlp/extractor/youtube.py
index 33c0e0b582516605fb9793d8289220b8d24523e8..02305c3f9968ebce984aac6b8ada03fa630a743f 100644 (file)
--- a/yt_dlp/extractor/youtube.py
+++ b/yt_dlp/extractor/youtube.py
@@ -3562,8 +3562,7 @@ def feed_entry(name):
 
         formats.extend(self._extract_storyboard(player_responses, duration))
 
-        # Source is given priority since formats that throttle are given lower source_preference
-        # When throttling issue is fully fixed, remove this
+        # source_preference is lower for throttled/potentially damaged formats
         self._sort_formats(formats, ('quality', 'res', 'fps', 'hdr:12', 'source', 'codec:vp9.2', 'lang', 'proto'))
 
         info = {