Skip to content

Commit 69e0b3a

Browse files
committed
rearrange imports
1 parent af83fd3 commit 69e0b3a

File tree

7 files changed

+23
-18
lines changed

7 files changed

+23
-18
lines changed

paseto/crypto/primitives.py

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
1-
from nacl.bindings import crypto_aead_xchacha20poly1305_ietf_encrypt as encrypt
21
from nacl.bindings import crypto_aead_xchacha20poly1305_ietf_decrypt as decrypt
2+
from nacl.bindings import crypto_aead_xchacha20poly1305_ietf_encrypt as encrypt
3+
from pysodium import crypto_sign_detached as sign
4+
from pysodium import crypto_sign_verify_detached as verify
35

46
# from pysodium import crypto_aead_xchacha20poly1305_ietf_encrypt as encrypt
57
# from pysodium import crypto_aead_xchacha20poly1305_ietf_decrypt as decrypt
68

7-
from pysodium import crypto_sign_detached as sign
8-
from pysodium import crypto_sign_verify_detached as verify
9-
109
# from libsodium import sign, verify, decrypt, encrypt
1110

1211
__all__ = ["encrypt", "decrypt", "sign", "verify"]

paseto/protocol/util.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
from typing import List
1+
from base64 import urlsafe_b64decode, urlsafe_b64encode
22
from struct import pack
3-
from base64 import urlsafe_b64encode, urlsafe_b64decode
3+
from typing import List
44

55

66
# specification: https://tools.ietf.org/html/draft-paragon-paseto-rfc-00#section-2.2.1

paseto/protocol/version2.py

+6-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
1-
import os
2-
import hmac
31
import hashlib
4-
from .util import pae, b64, b64decode
5-
from paseto.exceptions import InvalidHeader, InvalidFooter
2+
import hmac
3+
import os
4+
65
from paseto.crypto import primitives
6+
from paseto.exceptions import InvalidFooter, InvalidHeader
7+
8+
from .util import b64, b64decode, pae
79

810

911
class Version2:

setup.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
from distutils.core import setup
22
from distutils.extension import Extension
3-
from Cython.Build import cythonize
43

4+
from Cython.Build import cythonize
55

66
libsodium = Extension(
77
name="libsodium", sources=["paseto/crypto/libsodium.pyx"], libraries=["sodium"]

tests/protocol/test_paseto_v2_test_vectors.py

+5-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
1-
import pytest
1+
import os
22
import re
3-
from unittest.mock import patch, MagicMock
3+
from unittest.mock import MagicMock, patch
4+
5+
import pytest
6+
47
from paseto.protocol.version2 import Version2
5-
import os
68

79

810
class TestPasetoV2TestVectors(object):

tests/protocol/test_util.py

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1-
import pytest
21
from typing import List, Tuple
32

4-
from paseto.protocol.util import pae, b64, b64decode, padding_size
3+
import pytest
4+
5+
from paseto.protocol.util import b64, b64decode, padding_size, pae
56

67

78
# test against reference values

tests/protocol/test_version2.py

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
import pytest
2-
from paseto.protocol.version2 import Version2
2+
from nacl.bindings.crypto_sign import crypto_sign_seed_keypair, crypto_sign_SEEDBYTES
3+
34
from paseto.exceptions import InvalidFooter, InvalidHeader
45
from paseto.protocol.util import b64
5-
from nacl.bindings.crypto_sign import crypto_sign_seed_keypair, crypto_sign_SEEDBYTES
6+
from paseto.protocol.version2 import Version2
67

78

89
class TestVersion2(object):

0 commit comments

Comments
 (0)