Skip to content

Commit 0b4a8cc

Browse files
Require py3 for msoffcrypto
Quoting the deprecation warning for encryption, which is needed for msoffcrypto: Python 2 is no longer supported by the Python core team. Support for it is now deprecated in cryptography, and will be removed in the next release.
1 parent a4f2d82 commit 0b4a8cc

2 files changed

Lines changed: 5 additions & 3 deletions

File tree

requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@ pyparsing>=2.1.0,<3
22
olefile>=0.46
33
easygui
44
colorclass
5-
msoffcrypto-tool; platform_python_implementation!="PyPy" or (python_version>="3" and platform_system!="Windows" and platform_system!="Darwin")
5+
msoffcrypto-tool; python_version>="3" and (platform_python_implementation!="PyPy" or platform_system!="Windows" and platform_system!="Darwin")
66
pcodedmp>=1.2.5

setup.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -325,8 +325,10 @@ def main():
325325
"easygui",
326326
'colorclass',
327327
# msoffcrypto-tool is not installable on PyPy+Windows (see issue #473),
328-
# so we only require it if the platform is not Windows or not PyPy:
329-
'msoffcrypto-tool; platform_python_implementation!="PyPy" or (python_version>="3" and platform_system!="Windows" and platform_system!="Darwin")',
328+
# so we only require it if the platform is not Windows or not PyPy;
329+
# Also, usage of cryptography (used by msoffcrypt-tool) is deprecated for py2
330+
'msoffcrypto-tool; (python_version>="3" and platform_python_implementation!="PyPy") \
331+
or (python_version>="3" and platform_system!="Windows" and platform_system!="Darwin")',
330332
'pcodedmp>=1.2.5',
331333
],
332334
extras_require={

0 commit comments

Comments
 (0)