Skip to content

Commit 68cd108

Browse files
peppelinuxpeppelinux
committed
fix: flake8 and isort linting
1 parent ac6d9ed commit 68cd108

18 files changed

+56
-65
lines changed

‎pymdoccbor/mdoc/issuer.py‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,19 @@
11
import base64
22
import binascii
3-
import cbor2
43
import logging
54
from datetime import datetime, timezone
5+
from typing import Union
6+
7+
import cbor2
8+
from cbor_diag import cbor2diag
69
from cryptography.hazmat.primitives import serialization
710
from cryptography.hazmat.primitives.asymmetric.ec import EllipticCurvePublicKey
811
from cryptography.hazmat.primitives.asymmetric.ed25519 import Ed25519PublicKey
912
from cryptography.hazmat.primitives.asymmetric.rsa import RSAPublicKey
1013
from pycose.keys import CoseKey, EC2Key
11-
from typing import Union
1214

13-
from pymdoccbor.mso.issuer import MsoIssuer
14-
15-
from cbor_diag import cbor2diag
1615
from pymdoccbor.mdoc.exceptions import InvalidStatusDescriptor
17-
16+
from pymdoccbor.mso.issuer import MsoIssuer
1817

1918
logger = logging.getLogger("pymdoccbor")
2019

‎pymdoccbor/mdoc/issuersigned.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
import cbor2
21
from typing import Union
32

3+
import cbor2
4+
45
from pymdoccbor.mso.verifier import MsoVerifier
56

67

‎pymdoccbor/mdoc/verifier.py‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
import binascii
2-
import cbor2
32
import logging
4-
53
from typing import List
64

5+
import cbor2
6+
77
from pymdoccbor.exceptions import InvalidMdoc
8+
from pymdoccbor.mdoc.exceptions import (NoDocumentTypeProvided,
9+
NoSignedDocumentProvided)
810
from pymdoccbor.mdoc.issuersigned import IssuerSigned
9-
from pymdoccbor.mdoc.exceptions import NoDocumentTypeProvided, NoSignedDocumentProvided
1011

1112
logger = logging.getLogger('pymdoccbor')
1213

‎pymdoccbor/mso/issuer.py‎

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,23 @@
1-
import cbor2
21
import datetime
32
import hashlib
3+
import logging
44
import secrets
55
import uuid
6-
import logging
7-
8-
from pycose.keys import CoseKey
9-
from pycose.headers import Algorithm
10-
from pycose.messages import Sign1Message
11-
126
from typing import Union
137

14-
from pymdoccbor.exceptions import MsoPrivateKeyRequired
15-
from pymdoccbor import settings
16-
from pymdoccbor.x509 import selfsigned_x509cert
17-
from pymdoccbor.tools import shuffle_dict
8+
import cbor2
9+
from cbor_diag import cbor2diag
1810
from cryptography import x509
1911
from cryptography.hazmat.primitives import serialization
2012
from cryptography.x509 import Certificate
21-
from cbor_diag import cbor2diag
13+
from pycose.headers import Algorithm
14+
from pycose.keys import CoseKey
15+
from pycose.messages import Sign1Message
2216

17+
from pymdoccbor import settings
18+
from pymdoccbor.exceptions import MsoPrivateKeyRequired
19+
from pymdoccbor.tools import shuffle_dict
20+
from pymdoccbor.x509 import selfsigned_x509cert
2321

2422
logger = logging.getLogger("pymdoccbor")
2523

‎pymdoccbor/mso/verifier.py‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,16 @@
1-
import cbor2
2-
import cryptography
31
import logging
2+
from typing import Union
43

4+
import cbor2
5+
import cryptography
56
from cryptography.exceptions import InvalidSignature
67
from pycose.keys import EC2Key
78
from pycose.messages import Sign1Message
89

9-
from typing import Union
10-
11-
from pymdoccbor.exceptions import (
12-
MsoX509ChainNotFound,
13-
UnsupportedMsoDataFormat
14-
)
1510
from pymdoccbor import settings
11+
from pymdoccbor.exceptions import (MsoX509ChainNotFound,
12+
UnsupportedMsoDataFormat)
1613
from pymdoccbor.tools import bytes2CoseSign1, cborlist2CoseSign1
17-
1814

1915
logger = logging.getLogger("pymdoccbor")
2016

‎pymdoccbor/tests/cert_data.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from datetime import datetime, timezone, timedelta
1+
from datetime import datetime, timedelta, timezone
22

33
CERT_DATA = {
44
"country_name": "US",

‎pymdoccbor/tests/test_01_mdoc_parser.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
from pymdoccbor.mdoc.verifier import MdocCbor
33
from pymdoccbor.tools import pretty_print
44

5-
65
ISSUED_MDOC = "a36776657273696f6e63312e3069646f63756d656e747381a367646f6354797065756f72672e69736f2e31383031332e352e312e6d444c6c6973737565725369676e6564a26a6e616d65537061636573a1716f72672e69736f2e31383031332e352e3186d8185863a4686469676573744944006672616e646f6d58208798645b20ea200e19ffabac92624bee6aec63aceedecfb1b80077d22bfc20e971656c656d656e744964656e7469666965726b66616d696c795f6e616d656c656c656d656e7456616c756563446f65d818586ca4686469676573744944036672616e646f6d5820b23f627e8999c706df0c0a4ed98ad74af988af619b4bb078b89058553f44615d71656c656d656e744964656e7469666965726a69737375655f646174656c656c656d656e7456616c7565d903ec6a323031392d31302d3230d818586da4686469676573744944046672616e646f6d5820c7ffa307e5de921e67ba5878094787e8807ac8e7b5b3932d2ce80f00f3e9abaf71656c656d656e744964656e7469666965726b6578706972795f646174656c656c656d656e7456616c7565d903ec6a323032342d31302d3230d818586da4686469676573744944076672616e646f6d582026052a42e5880557a806c1459af3fb7eb505d3781566329d0b604b845b5f9e6871656c656d656e744964656e7469666965726f646f63756d656e745f6e756d6265726c656c656d656e7456616c756569313233343536373839d818590471a4686469676573744944086672616e646f6d5820d094dad764a2eb9deb5210e9d899643efbd1d069cc311d3295516ca0b024412d71656c656d656e744964656e74696669657268706f7274726169746c656c656d656e7456616c7565590412ffd8ffe000104a46494600010101009000900000ffdb004300130d0e110e0c13110f11151413171d301f1d1a1a1d3a2a2c2330453d4947443d43414c566d5d4c51685241435f82606871757b7c7b4a5c869085778f6d787b76ffdb0043011415151d191d381f1f38764f434f7676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676ffc00011080018006403012200021101031101ffc4001b00000301000301000000000000000000000005060401020307ffc400321000010303030205020309000000000000010203040005110612211331141551617122410781a1163542527391b2c1f1ffc4001501010100000000000000000000000000000001ffc4001a110101010003010000000000000000000000014111213161ffda000c03010002110311003f00a5bbde22da2329c7d692bc7d0d03f52cfb0ff75e7a7ef3e7709723a1d0dae146ddfbb3c039ce07ad2bd47a7e32dbb8dd1d52d6ef4b284f64a480067dfb51f87ffb95ff00eb9ff14d215de66af089ce44b7dbde9cb6890a2838eddf18078f7add62d411ef4db9b10a65d6b95a147381ea0d495b933275fe6bba75c114104a8ba410413e983dff004f5af5d34b4b4cde632d0bf1fd1592bdd91c6411f3934c2fa6af6b54975d106dcf4a65ae56e856001ebc03c7ce29dd9eef1ef10fc447dc9da76ad2aee93537a1ba7e4f70dd8eff0057c6dffb5e1a19854a83758e54528750946ec6704850cd037bceb08b6d7d2cc76d3317fc7b5cc04fb6707269c5c6e0c5b60ae549242123b0e493f602a075559e359970d98db89525456b51c951c8afa13ea8e98e3c596836783d5c63f5a61a99fdb7290875db4be88ab384bbbbbfc7183fdeaa633e8951db7da396dc48524fb1a8bd611a5aa2a2432f30ab420a7a6d3240c718cf031fa9ef4c9ad550205aa02951df4a1d6c8421b015b769db8c9229837ea2be8b1b0d39d0eba9c51484efdb8c0efd8d258daf3c449699f2edbd4584e7af9c64e3f96b9beb28d4ac40931e6478c8e76a24a825449501d867d2b1dcdebae99b9c752ae4ecd6dde4a179c1c1e460938f9149ef655e515c03919a289cb3dca278fb7bf177f4faa829dd8ce3f2ac9a7ecde490971fafd7dce15eed9b71c018c64fa514514b24e8e4f8c5c9b75c1e82579dc1233dfec08238f6add62d391acc1c5256a79e706d52d431c7a0145140b9fd149eb3a60dc5e88cbbc2da092411e9dc71f39a7766b447b344e847dcac9dcb5abba8d145061d43a6fcf1e65cf15d0e90231d3dd9cfe62995c6dcc5ca12a2c904a15f71dd27d451453e09d1a21450961cbb3ea8a956433b781f1ce33dfed54f0e2b50a2b71d84ed6db18028a28175f74fc6bda105c529a791c25c4f3c7a11f71586268f4a66b726e33de9ea6f1b52b181c760724e47b514520a5a28a283ffd9d81858ffa4686469676573744944096672616e646f6d58204599f81beaa2b20bd0ffcc9aa03a6f985befab3f6beaffa41e6354cdb2ab2ce471656c656d656e744964656e7469666965727264726976696e675f70726976696c656765736c656c656d656e7456616c756582a37576656869636c655f63617465676f72795f636f646561416a69737375655f64617465d903ec6a323031382d30382d30396b6578706972795f64617465d903ec6a323032342d31302d3230a37576656869636c655f63617465676f72795f636f646561426a69737375655f64617465d903ec6a323031372d30322d32336b6578706972795f64617465d903ec6a323032342d31302d32306a697373756572417574688443a10126a118215901d2308201ce30820174a003020102021401ec51916031e6898e8fc7864af5e6d5f86602b6300a06082a8648ce3d04030230233114301206035504030c0b75746f7069612069616361310b3009060355040613025553301e170d3230313030313030303030305a170d3231313030313030303030305a30213112301006035504030c0975746f706961206473310b30090603550406130255533059301306072a8648ce3d020106082a8648ce3d03010703420004ace7ab7340e5d9648c5a72a9a6f56745c7aad436a03a43efea77b5fa7b88f0197d57d8983e1b37d3a539f4d588365e38cbbf5b94d68c547b5bc8731dcd2f146ba38187308184301e0603551d120417301581136578616d706c65406578616d706c652e636f6d301c0603551d1f041530133011a00fa00d820b6578616d706c652e636f6d301d0603551d0e0416041414e29017a6c35621ffc7a686b7b72db06cd12351300e0603551d0f0101ff04040302078030150603551d250101ff040b3009060728818c5d050102300a06082a8648ce3d0403020348003045022100bac6f93a8bacf0fc9aeac1c89a5c9293af2076942e9e972882a113640330702702207b7b73c0444371a4c94c9c888ddfe553ffde84ca492fd64dfbf02ad46a31cbc85903a2d81859039da66776657273696f6e63312e306f646967657374416c676f726974686d675348412d3235366c76616c756544696765737473a2716f72672e69736f2e31383031332e352e31ad00582075167333b47b6c2bfb86eccc1f438cf57af055371ac55e1e359e20f254adcebf01582067e539d6139ebd131aef441b445645dd831b2b375b390ca5ef6279b205ed45710258203394372ddb78053f36d5d869780e61eda313d44a392092ad8e0527a2fbfe55ae0358202e35ad3c4e514bb67b1a9db51ce74e4cb9b7146e41ac52dac9ce86b8613db555045820ea5c3304bb7c4a8dcb51c4c13b65264f845541341342093cca786e058fac2d59055820fae487f68b7a0e87a749774e56e9e1dc3a8ec7b77e490d21f0e1d3475661aa1d0658207d83e507ae77db815de4d803b88555d0511d894c897439f5774056416a1c7533075820f0549a145f1cf75cbeeffa881d4857dd438d627cf32174b1731c4c38e12ca936085820b68c8afcb2aaf7c581411d2877def155be2eb121a42bc9ba5b7312377e068f660958200b3587d1dd0c2a07a35bfb120d99a0abfb5df56865bb7fa15cc8b56a66df6e0c0a5820c98a170cf36e11abb724e98a75a5343dfa2b6ed3df2ecfbb8ef2ee55dd41c8810b5820b57dd036782f7b14c6a30faaaae6ccd5054ce88bdfa51a016ba75eda1edea9480c5820651f8736b18480fe252a03224ea087b5d10ca5485146c67c74ac4ec3112d4c3a746f72672e69736f2e31383031332e352e312e5553a4005820d80b83d25173c484c5640610ff1a31c949c1d934bf4cf7f18d5223b15dd4f21c0158204d80e1e2e4fb246d97895427ce7000bb59bb24c8cd003ecf94bf35bbd2917e340258208b331f3b685bca372e85351a25c9484ab7afcdf0d2233105511f778d98c2f544035820c343af1bd1690715439161aba73702c474abf992b20c9fb55c36a336ebe01a876d6465766963654b6579496e666fa1696465766963654b6579a40102200121582096313d6c63e24e3372742bfdb1a33ba2c897dcd68ab8c753e4fbd48dca6b7f9a2258201fb3269edd418857de1b39a4e4a44b92fa484caa722c228288f01d0c03a2c3d667646f6354797065756f72672e69736f2e31383031332e352e312e6d444c6c76616c6964697479496e666fa3667369676e6564c074323032302d31302d30315431333a33303a30325a6976616c696446726f6dc074323032302d31302d30315431333a33303a30325a6a76616c6964556e74696cc074323032312d31302d30315431333a33303a30325a5840cff12c17d4739aba806035a9cb2b34ae8a830cef4f329289f9a3ebd302dd6b99c584068257569397b92ba9aa5128554eb05d1273dafea313da4aff6b01a5fb3f6c6465766963655369676e6564a26a6e616d65537061636573d81841a06a64657669636541757468a1696465766963654d61638443a10105a0f65820200d73ded787c64652dc8ee743ea83a5260d5a3283fddc919b7b9cfb486addb26673746174757300"
76

87

‎pymdoccbor/tests/test_02_mdoc_issuer.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import cbor2
2-
32
from asn1crypto.x509 import Certificate
43
from cryptography import x509
54
from cryptography.hazmat.primitives import serialization
@@ -9,8 +8,8 @@
98
from pymdoccbor.mdoc.issuer import MdocCborIssuer
109
from pymdoccbor.mdoc.verifier import MdocCbor
1110
from pymdoccbor.mso.issuer import MsoIssuer
12-
from pymdoccbor.tests.pid_data import PID_DATA
1311
from pymdoccbor.tests.cert_data import CERT_DATA
12+
from pymdoccbor.tests.pid_data import PID_DATA
1413
from pymdoccbor.tests.pkey import PKEY, PKEY_ED25519, PKEY_RSA
1514

1615

‎pymdoccbor/tests/test_03_mdoc_issuer.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
from pymdoccbor.mdoc.issuer import MdocCborIssuer
2+
from pymdoccbor.tests.cert_data import CERT_DATA
23
from pymdoccbor.tests.micov_data import MICOV_DATA
34
from pymdoccbor.tests.pkey import PKEY
4-
from pymdoccbor.tests.cert_data import CERT_DATA
55

66
mdoc = MdocCborIssuer(
77
private_key=PKEY,

‎pymdoccbor/tests/test_04_issuer_signed.py‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
from pymdoccbor.mdoc.issuersigned import IssuerSigned
21
from pymdoccbor.mdoc.issuer import MdocCborIssuer
2+
from pymdoccbor.mdoc.issuersigned import IssuerSigned
3+
from pymdoccbor.tests.cert_data import CERT_DATA
34
from pymdoccbor.tests.micov_data import MICOV_DATA
45
from pymdoccbor.tests.pkey import PKEY
5-
from pymdoccbor.tests.cert_data import CERT_DATA
6-
76

87
mdoc = MdocCborIssuer(
98
private_key=PKEY,

0 commit comments

Comments
 (0)