Yasuke/moto
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Keep sshpubkeys import function-local (~0.5s)

Browse Source
This commit is contained in:
Stijn Seghers 2020-01-17 14:09:07 +13:00
parent b8820009e8
commit 8ff248456b
No known key found for this signature in database
GPG Key ID: BF6A2BFEA196E7B6
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
moto/ec2/utils.py
View File

@ -10,8 +10,6 @@ import six
from cryptography.hazmat.primitives import serialization from cryptography.hazmat.primitives import serialization
from cryptography.hazmat.backends import default_backend from cryptography.hazmat.backends import default_backend
from cryptography.hazmat.primitives.asymmetric import rsa from cryptography.hazmat.primitives.asymmetric import rsa
import sshpubkeys.exceptions
from sshpubkeys.keys import SSHKey
EC2_RESOURCE_TO_PREFIX = { EC2_RESOURCE_TO_PREFIX = {
@ -544,6 +542,10 @@ def generate_instance_identity_document(instance):
def rsa_public_key_parse(key_material): def rsa_public_key_parse(key_material):
# These imports take ~.5s; let's keep them local
import sshpubkeys.exceptions
from sshpubkeys.keys import SSHKey
try: try:
if not isinstance(key_material, six.binary_type): if not isinstance(key_material, six.binary_type):
key_material = key_material.encode("ascii") key_material = key_material.encode("ascii")