Handle using pycryptodome instead of pycryptodomex

jupyter-server · Sep 30, 2020 · 511d7a2 · 511d7a2
1 parent f429b1a
commit 511d7a2
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/enterprise_gateway/services/processproxies/processproxy.py b/enterprise_gateway/services/processproxies/processproxy.py
@@ -27,7 +27,11 @@
 from jupyter_client import launch_kernel, localinterfaces
 from notebook import _tz
 from zmq.ssh import tunnel
-from Cryptodome.Cipher import AES
+
+try:
+    from Cryptodome.Cipher import AES
+except ImportError:
+    from Crypto.Cipher import AES
 
 from ..sessions.kernelsessionmanager import KernelSessionManager
 

diff --git a/etc/kernel-launchers/python/scripts/launch_ipykernel.py b/etc/kernel-launchers/python/scripts/launch_ipykernel.py
@@ -11,7 +11,11 @@
 from random import random
 from threading import Thread
 
-from Cryptodome.Cipher import AES
+try:
+    from Cryptodome.Cipher import AES
+except ImportError:
+    from Crypto.Cipher import AES
+
 from ipython_genutils.py3compat import str_to_bytes
 from jupyter_client.connect import write_connection_file