aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJesús <heckyel@hyperbola.info>2021-10-18 17:24:52 -0500
committerJesús <heckyel@hyperbola.info>2021-10-18 17:24:52 -0500
commitf52fb3bceeb9d22b5106c1796fecec474a0cc138 (patch)
tree90904f8d6621f0d75c95edc68f158bd0c66b6980
parent5122028a4bcac4ae577ef7fbd55ccad5cb34ef5e (diff)
downloadhypervideo-f52fb3bceeb9d22b5106c1796fecec474a0cc138.tar.lz
hypervideo-f52fb3bceeb9d22b5106c1796fecec474a0cc138.tar.xz
hypervideo-f52fb3bceeb9d22b5106c1796fecec474a0cc138.zip
change pycryptodomex to pycryptodome
-rw-r--r--Changelog.md6
-rw-r--r--hypervideo_dl/downloader/hls.py4
-rw-r--r--hypervideo_dl/extractor/ivi.py2
-rw-r--r--requirements.txt2
-rw-r--r--setup.py2
5 files changed, 8 insertions, 8 deletions
diff --git a/Changelog.md b/Changelog.md
index 2e6da33..90f9bda 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -88,7 +88,7 @@
* [update] Check for new version even if not updateable
* [build] Add more files to the tarball
* [build] Allow building with py2exe (and misc fixes)
-* [build] Use pycryptodomex by [shirt](https://github.com/shirt-dev), [pukkandan](https://github.com/pukkandan)
+* [build] Use pycryptodome by [shirt](https://github.com/shirt-dev), [pukkandan](https://github.com/pukkandan)
* [cleanup] Some minor refactoring, improve docs and misc cleanup
@@ -549,7 +549,7 @@
* [youtube] Non-fatal alert reporting for unavailable videos page by [coletdjnz](https://github.com/coletdjnz)
* [twitcasting] Websocket support by [nao20010128nao](https://github.com/nao20010128nao)
* [mediasite] Extract slides by [fstirlitz](https://github.com/fstirlitz)
-* [funimation] Extract subtitles
+* [funimation] Extract subtitles
* [pornhub] Extract `cast`
* [hotstar] Use server time for authentication instead of local time
* [EmbedThumbnail] Fix for already downloaded thumbnail
@@ -645,7 +645,7 @@
### 2021.05.20
-* **Youtube improvements**:
+* **Youtube improvements**:
* Support youtube music `MP`, `VL` and `browse` pages
* Extract more formats for youtube music by [craftingmod](https://github.com/craftingmod), [coletdjnz](https://github.com/coletdjnz) and [pukkandan](https://github.com/pukkandan)
* Extract multiple subtitles in same language by [pukkandan](https://github.com/pukkandan) and [tpikonen](https://github.com/tpikonen)
diff --git a/hypervideo_dl/downloader/hls.py b/hypervideo_dl/downloader/hls.py
index 61312c5..ef8a81b 100644
--- a/hypervideo_dl/downloader/hls.py
+++ b/hypervideo_dl/downloader/hls.py
@@ -72,9 +72,9 @@ class HlsFD(FragmentFD):
can_download, message = self.can_download(s, info_dict, self.params.get('allow_unplayable_formats')), None
if can_download and not compat_pycrypto_AES and '#EXT-X-KEY:METHOD=AES-128' in s:
if FFmpegFD.available():
- can_download, message = False, 'The stream has AES-128 encryption and pycryptodomex is not available'
+ can_download, message = False, 'The stream has AES-128 encryption and pycryptodome is not available'
else:
- message = ('The stream has AES-128 encryption and neither ffmpeg nor pycryptodomex are available; '
+ message = ('The stream has AES-128 encryption and neither ffmpeg nor pycryptodome are available; '
'Decryption will be performed natively, but will be extremely slow')
if not can_download:
message = message or 'Unsupported features have been detected'
diff --git a/hypervideo_dl/extractor/ivi.py b/hypervideo_dl/extractor/ivi.py
index 5f8a046..098ab66 100644
--- a/hypervideo_dl/extractor/ivi.py
+++ b/hypervideo_dl/extractor/ivi.py
@@ -141,7 +141,7 @@ class IviIE(InfoExtractor):
elif site == 353:
continue
elif not pycryptodome_found:
- raise ExtractorError('pycryptodomex not found. Please install', expected=True)
+ raise ExtractorError('pycryptodome not found. Please install', expected=True)
elif message:
extractor_msg += ': ' + message
raise ExtractorError(extractor_msg % video_id, expected=True)
diff --git a/requirements.txt b/requirements.txt
index cecd08e..6a982fa 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,3 +1,3 @@
mutagen
-pycryptodomex
+pycryptodome
websockets
diff --git a/setup.py b/setup.py
index c56148e..850ca07 100644
--- a/setup.py
+++ b/setup.py
@@ -23,7 +23,7 @@ LONG_DESCRIPTION = '\n\n'.join((
'**PS**: Some 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()))
-REQUIREMENTS = ['mutagen', 'pycryptodomex', 'websockets']
+REQUIREMENTS = ['mutagen', 'pycryptodome', 'websockets']
if sys.argv[1:2] == ['py2exe']: