diff --git a/pyhanko/generated/etsi/ts_11910202.py b/pyhanko/generated/etsi/ts_11910202.py index 381de626..7dc713df 100644 --- a/pyhanko/generated/etsi/ts_11910202.py +++ b/pyhanko/generated/etsi/ts_11910202.py @@ -527,16 +527,16 @@ class SignatureIdentifierType: @dataclass(frozen=True) class SignatureValidationPolicyType: - signature_policy_identifier: Optional[ - SignaturePolicyIdentifierType - ] = field( - default=None, - metadata={ - "name": "SignaturePolicyIdentifier", - "type": "Element", - "namespace": "http://uri.etsi.org/19102/v1.2.1#", - "required": True, - }, + signature_policy_identifier: Optional[SignaturePolicyIdentifierType] = ( + field( + default=None, + metadata={ + "name": "SignaturePolicyIdentifier", + "type": "Element", + "namespace": "http://uri.etsi.org/19102/v1.2.1#", + "required": True, + }, + ) ) policy_name: Optional[str] = field( default=None, @@ -986,15 +986,15 @@ class ValidationReportDataType: "namespace": "http://uri.etsi.org/19102/v1.2.1#", }, ) - revocation_status_information: Optional[ - RevocationStatusInformationType - ] = field( - default=None, - metadata={ - "name": "RevocationStatusInformation", - "type": "Element", - "namespace": "http://uri.etsi.org/19102/v1.2.1#", - }, + revocation_status_information: Optional[RevocationStatusInformationType] = ( + field( + default=None, + metadata={ + "name": "RevocationStatusInformation", + "type": "Element", + "namespace": "http://uri.etsi.org/19102/v1.2.1#", + }, + ) ) crypto_information: Optional[CryptoInformationType] = field( default=None, @@ -1159,15 +1159,15 @@ class ValidationStatusType: "namespace": "http://uri.etsi.org/19102/v1.2.1#", }, ) - associated_validation_report_data: Tuple[ - ValidationReportDataType, ... - ] = field( - default_factory=tuple, - metadata={ - "name": "AssociatedValidationReportData", - "type": "Element", - "namespace": "http://uri.etsi.org/19102/v1.2.1#", - }, + associated_validation_report_data: Tuple[ValidationReportDataType, ...] = ( + field( + default_factory=tuple, + metadata={ + "name": "AssociatedValidationReportData", + "type": "Element", + "namespace": "http://uri.etsi.org/19102/v1.2.1#", + }, + ) ) @@ -1291,15 +1291,15 @@ class SignatureAttributesType: "namespace": "http://uri.etsi.org/19102/v1.2.1#", }, ) - commitment_type_indication: Tuple[ - SACommitmentTypeIndicationType, ... - ] = field( - default_factory=tuple, - metadata={ - "name": "CommitmentTypeIndication", - "type": "Element", - "namespace": "http://uri.etsi.org/19102/v1.2.1#", - }, + commitment_type_indication: Tuple[SACommitmentTypeIndicationType, ...] = ( + field( + default_factory=tuple, + metadata={ + "name": "CommitmentTypeIndication", + "type": "Element", + "namespace": "http://uri.etsi.org/19102/v1.2.1#", + }, + ) ) all_data_objects_time_stamp: Tuple[SATimestampType, ...] = field( default_factory=tuple, @@ -1325,15 +1325,15 @@ class SignatureAttributesType: "namespace": "http://uri.etsi.org/19102/v1.2.1#", }, ) - signature_production_place: Tuple[ - SASignatureProductionPlaceType, ... - ] = field( - default_factory=tuple, - metadata={ - "name": "SignatureProductionPlace", - "type": "Element", - "namespace": "http://uri.etsi.org/19102/v1.2.1#", - }, + signature_production_place: Tuple[SASignatureProductionPlaceType, ...] = ( + field( + default_factory=tuple, + metadata={ + "name": "SignatureProductionPlace", + "type": "Element", + "namespace": "http://uri.etsi.org/19102/v1.2.1#", + }, + ) ) signer_role: Tuple[SASignerRoleType, ...] = field( default_factory=tuple, @@ -1556,15 +1556,15 @@ class SignatureAttributesType: @dataclass(frozen=True) class ValidationConstraintsEvaluationReportType: - signature_validation_policy: Optional[ - SignatureValidationPolicyType - ] = field( - default=None, - metadata={ - "name": "SignatureValidationPolicy", - "type": "Element", - "namespace": "http://uri.etsi.org/19102/v1.2.1#", - }, + signature_validation_policy: Optional[SignatureValidationPolicyType] = ( + field( + default=None, + metadata={ + "name": "SignatureValidationPolicy", + "type": "Element", + "namespace": "http://uri.etsi.org/19102/v1.2.1#", + }, + ) ) validation_constraint: Tuple[ IndividualValidationConstraintReportType, ... @@ -1638,15 +1638,15 @@ class SignatureValidationReportType: "namespace": "http://uri.etsi.org/19102/v1.2.1#", }, ) - signature_validation_process: Optional[ - SignatureValidationProcessType - ] = field( - default=None, - metadata={ - "name": "SignatureValidationProcess", - "type": "Element", - "namespace": "http://uri.etsi.org/19102/v1.2.1#", - }, + signature_validation_process: Optional[SignatureValidationProcessType] = ( + field( + default=None, + metadata={ + "name": "SignatureValidationProcess", + "type": "Element", + "namespace": "http://uri.etsi.org/19102/v1.2.1#", + }, + ) ) signature_validation_status: Optional[ValidationStatusType] = field( default=None, @@ -1736,16 +1736,16 @@ class ValidationObjectListType: @dataclass(frozen=True) class ValidationReportType: - signature_validation_report: Tuple[ - SignatureValidationReportType, ... - ] = field( - default_factory=tuple, - metadata={ - "name": "SignatureValidationReport", - "type": "Element", - "namespace": "http://uri.etsi.org/19102/v1.2.1#", - "min_occurs": 1, - }, + signature_validation_report: Tuple[SignatureValidationReportType, ...] = ( + field( + default_factory=tuple, + metadata={ + "name": "SignatureValidationReport", + "type": "Element", + "namespace": "http://uri.etsi.org/19102/v1.2.1#", + "min_occurs": 1, + }, + ) ) signature_validation_objects: Optional[ValidationObjectListType] = field( default=None, diff --git a/pyhanko/generated/etsi/ts_119612.py b/pyhanko/generated/etsi/ts_119612.py index 4513017a..97535455 100644 --- a/pyhanko/generated/etsi/ts_119612.py +++ b/pyhanko/generated/etsi/ts_119612.py @@ -678,15 +678,15 @@ class TSPServiceInformationType: "required": True, }, ) - scheme_service_definition_uri: Optional[ - NonEmptyMultiLangURIListType - ] = field( - default=None, - metadata={ - "name": "SchemeServiceDefinitionURI", - "type": "Element", - "namespace": "http://uri.etsi.org/02231/v2#", - }, + scheme_service_definition_uri: Optional[NonEmptyMultiLangURIListType] = ( + field( + default=None, + metadata={ + "name": "SchemeServiceDefinitionURI", + "type": "Element", + "namespace": "http://uri.etsi.org/02231/v2#", + }, + ) ) service_supply_points: Optional[ServiceSupplyPoints] = field( default=None, diff --git a/pyhanko/generated/etsi/xades.py b/pyhanko/generated/etsi/xades.py index 15b7de70..524c3b1e 100644 --- a/pyhanko/generated/etsi/xades.py +++ b/pyhanko/generated/etsi/xades.py @@ -833,15 +833,15 @@ class CommitmentTypeIndicationType: "namespace": "http://uri.etsi.org/01903/v1.3.2#", }, ) - commitment_type_qualifiers: Optional[ - CommitmentTypeQualifiersListType - ] = field( - default=None, - metadata={ - "name": "CommitmentTypeQualifiers", - "type": "Element", - "namespace": "http://uri.etsi.org/01903/v1.3.2#", - }, + commitment_type_qualifiers: Optional[CommitmentTypeQualifiersListType] = ( + field( + default=None, + metadata={ + "name": "CommitmentTypeQualifiers", + "type": "Element", + "namespace": "http://uri.etsi.org/01903/v1.3.2#", + }, + ) ) @@ -1208,15 +1208,15 @@ class SignedDataObjectPropertiesType: "namespace": "http://uri.etsi.org/01903/v1.3.2#", }, ) - commitment_type_indication: Tuple[ - CommitmentTypeIndicationType, ... - ] = field( - default_factory=tuple, - metadata={ - "name": "CommitmentTypeIndication", - "type": "Element", - "namespace": "http://uri.etsi.org/01903/v1.3.2#", - }, + commitment_type_indication: Tuple[CommitmentTypeIndicationType, ...] = ( + field( + default_factory=tuple, + metadata={ + "name": "CommitmentTypeIndication", + "type": "Element", + "namespace": "http://uri.etsi.org/01903/v1.3.2#", + }, + ) ) all_data_objects_time_stamp: Tuple[XAdESTimeStampType, ...] = field( default_factory=tuple, @@ -1261,15 +1261,15 @@ class SignedSignaturePropertiesType: "namespace": "http://uri.etsi.org/01903/v1.3.2#", }, ) - signature_policy_identifier: Optional[ - SignaturePolicyIdentifierType - ] = field( - default=None, - metadata={ - "name": "SignaturePolicyIdentifier", - "type": "Element", - "namespace": "http://uri.etsi.org/01903/v1.3.2#", - }, + signature_policy_identifier: Optional[SignaturePolicyIdentifierType] = ( + field( + default=None, + metadata={ + "name": "SignaturePolicyIdentifier", + "type": "Element", + "namespace": "http://uri.etsi.org/01903/v1.3.2#", + }, + ) ) signature_production_place: Optional[SignatureProductionPlaceType] = field( default=None, @@ -1432,25 +1432,25 @@ class Meta: @dataclass(frozen=True) class SignedPropertiesType: - signed_signature_properties: Optional[ - SignedSignaturePropertiesType - ] = field( - default=None, - metadata={ - "name": "SignedSignatureProperties", - "type": "Element", - "namespace": "http://uri.etsi.org/01903/v1.3.2#", - }, - ) - signed_data_object_properties: Optional[ - SignedDataObjectPropertiesType - ] = field( - default=None, - metadata={ - "name": "SignedDataObjectProperties", - "type": "Element", - "namespace": "http://uri.etsi.org/01903/v1.3.2#", - }, + signed_signature_properties: Optional[SignedSignaturePropertiesType] = ( + field( + default=None, + metadata={ + "name": "SignedSignatureProperties", + "type": "Element", + "namespace": "http://uri.etsi.org/01903/v1.3.2#", + }, + ) + ) + signed_data_object_properties: Optional[SignedDataObjectPropertiesType] = ( + field( + default=None, + metadata={ + "name": "SignedDataObjectProperties", + "type": "Element", + "namespace": "http://uri.etsi.org/01903/v1.3.2#", + }, + ) ) id: Optional[str] = field( default=None, @@ -1469,15 +1469,15 @@ class Meta: @dataclass(frozen=True) class UnsignedPropertiesType: - unsigned_signature_properties: Optional[ - UnsignedSignaturePropertiesType - ] = field( - default=None, - metadata={ - "name": "UnsignedSignatureProperties", - "type": "Element", - "namespace": "http://uri.etsi.org/01903/v1.3.2#", - }, + unsigned_signature_properties: Optional[UnsignedSignaturePropertiesType] = ( + field( + default=None, + metadata={ + "name": "UnsignedSignatureProperties", + "type": "Element", + "namespace": "http://uri.etsi.org/01903/v1.3.2#", + }, + ) ) unsigned_data_object_properties: Optional[ UnsignedDataObjectPropertiesType diff --git a/pyhanko/pdf_utils/crypt/__init__.py b/pyhanko/pdf_utils/crypt/__init__.py index c886a938..e6b05412 100644 --- a/pyhanko/pdf_utils/crypt/__init__.py +++ b/pyhanko/pdf_utils/crypt/__init__.py @@ -55,6 +55,7 @@ As long as you don't require access to encoded object data and/or raw encrypted object data, this distiction should be irrelevant to you as an API user. """ + from .api import ( ALL_PERMS, IDENTITY, diff --git a/pyhanko/pdf_utils/filters.py b/pyhanko/pdf_utils/filters.py index 2cfbcec6..891e83b6 100644 --- a/pyhanko/pdf_utils/filters.py +++ b/pyhanko/pdf_utils/filters.py @@ -7,6 +7,7 @@ Note that not all decoders specified in the standard are supported. In particular ``/LZWDecode`` and the various JPEG-based decoders are missing. """ + import binascii import re import struct diff --git a/pyhanko/pdf_utils/font/opentype.py b/pyhanko/pdf_utils/font/opentype.py index be4ff47e..cd612afd 100644 --- a/pyhanko/pdf_utils/font/opentype.py +++ b/pyhanko/pdf_utils/font/opentype.py @@ -3,6 +3,7 @@ This module relies on `fontTools `_ for OTF parsing and subsetting, and on HarfBuzz (via ``uharfbuzz``) for shaping. """ + import logging from binascii import hexlify from dataclasses import dataclass diff --git a/pyhanko/pdf_utils/generic.py b/pyhanko/pdf_utils/generic.py index aa26e2d2..fcf85af5 100644 --- a/pyhanko/pdf_utils/generic.py +++ b/pyhanko/pdf_utils/generic.py @@ -5,6 +5,7 @@ See :ref:`here ` for the original license of the PyPDF2 project. """ + import binascii import codecs import decimal diff --git a/pyhanko/pdf_utils/metadata/model.py b/pyhanko/pdf_utils/metadata/model.py index 726554d3..e83a0d1b 100644 --- a/pyhanko/pdf_utils/metadata/model.py +++ b/pyhanko/pdf_utils/metadata/model.py @@ -5,6 +5,7 @@ in addition to a simplified document metadata model used for automated metadata management. """ + import enum from dataclasses import dataclass, field from datetime import datetime diff --git a/pyhanko/pdf_utils/misc.py b/pyhanko/pdf_utils/misc.py index 7e68ed8a..3044b018 100644 --- a/pyhanko/pdf_utils/misc.py +++ b/pyhanko/pdf_utils/misc.py @@ -7,7 +7,6 @@ classes. """ - import os from dataclasses import dataclass from datetime import datetime, timezone diff --git a/pyhanko/pdf_utils/reader.py b/pyhanko/pdf_utils/reader.py index d77ac415..6f8da6a5 100644 --- a/pyhanko/pdf_utils/reader.py +++ b/pyhanko/pdf_utils/reader.py @@ -9,6 +9,7 @@ This comes at a cost, and future iterations of this module may offer more flexibility in terms of the level of detail with which file size is scrutinised. """ + import logging import os import re diff --git a/pyhanko/pdf_utils/rw_common.py b/pyhanko/pdf_utils/rw_common.py index 294995d7..6898e6ea 100644 --- a/pyhanko/pdf_utils/rw_common.py +++ b/pyhanko/pdf_utils/rw_common.py @@ -1,4 +1,5 @@ """Utilities common to reading and writing PDF files.""" + from typing import Tuple from . import generic, misc diff --git a/pyhanko/pdf_utils/xref.py b/pyhanko/pdf_utils/xref.py index b43eda7f..03c490e8 100644 --- a/pyhanko/pdf_utils/xref.py +++ b/pyhanko/pdf_utils/xref.py @@ -5,7 +5,6 @@ This entire module is considered internal API. """ - import enum import logging import os diff --git a/pyhanko/sign/diff_analysis/commons.py b/pyhanko/sign/diff_analysis/commons.py index 9df29d27..0d3dd18e 100644 --- a/pyhanko/sign/diff_analysis/commons.py +++ b/pyhanko/sign/diff_analysis/commons.py @@ -4,7 +4,6 @@ In principle, these aren't relevant to the high-level validation API. """ - import logging from typing import Callable, FrozenSet, Generator, Optional, Set, Tuple, TypeVar diff --git a/pyhanko/sign/diff_analysis/rules_api.py b/pyhanko/sign/diff_analysis/rules_api.py index 4f14a063..40a61b37 100644 --- a/pyhanko/sign/diff_analysis/rules_api.py +++ b/pyhanko/sign/diff_analysis/rules_api.py @@ -3,6 +3,7 @@ In principle, these aren't relevant to the high-level validation API. """ + import logging from dataclasses import dataclass from dataclasses import field as dataclass_field diff --git a/pyhanko/sign/fields.py b/pyhanko/sign/fields.py index f8490aaa..6919b808 100644 --- a/pyhanko/sign/fields.py +++ b/pyhanko/sign/fields.py @@ -1,6 +1,7 @@ """ Utilities to deal with signature form fields and their properties in PDF files. """ + import logging from dataclasses import dataclass from enum import Enum, Flag, unique diff --git a/pyhanko/sign/pkcs11.py b/pyhanko/sign/pkcs11.py index c818b8d3..d0abb53f 100644 --- a/pyhanko/sign/pkcs11.py +++ b/pyhanko/sign/pkcs11.py @@ -3,6 +3,7 @@ for `python-pkcs11 `_ that can be seamlessly plugged into a :class:`~.signers.PdfSigner`. """ + import asyncio import binascii import logging diff --git a/pyhanko/sign/signers/constants.py b/pyhanko/sign/signers/constants.py index 58f15c38..234109bd 100644 --- a/pyhanko/sign/signers/constants.py +++ b/pyhanko/sign/signers/constants.py @@ -2,6 +2,7 @@ This module defines constants & defaults used by pyHanko when creating digital signatures. """ + from pyhanko.pdf_utils import generic from pyhanko.pdf_utils.extensions import ( DeveloperExtension, diff --git a/pyhanko/sign/signers/pdf_cms.py b/pyhanko/sign/signers/pdf_cms.py index 5992514c..04ce09cb 100644 --- a/pyhanko/sign/signers/pdf_cms.py +++ b/pyhanko/sign/signers/pdf_cms.py @@ -2,6 +2,7 @@ This module defines utility classes to format CMS objects for use in PDF signatures. """ + import asyncio import logging import warnings diff --git a/pyhanko/sign/signers/pdf_signer.py b/pyhanko/sign/signers/pdf_signer.py index 439c7954..f656dbd4 100644 --- a/pyhanko/sign/signers/pdf_signer.py +++ b/pyhanko/sign/signers/pdf_signer.py @@ -1,6 +1,7 @@ """ This module implements support for PDF-specific signing functionality. """ + import asyncio import enum import logging diff --git a/pyhanko/sign/timestamps/api.py b/pyhanko/sign/timestamps/api.py index 3d98fd45..da7e1b61 100644 --- a/pyhanko/sign/timestamps/api.py +++ b/pyhanko/sign/timestamps/api.py @@ -6,6 +6,7 @@ :rfc:`3161`-compliant time stamping authorities. """ + import asyncio from asn1crypto import algos, cms, tsp diff --git a/pyhanko/sign/validation/ades.py b/pyhanko/sign/validation/ades.py index 3aed1f75..5bae5e47 100644 --- a/pyhanko/sign/validation/ades.py +++ b/pyhanko/sign/validation/ades.py @@ -7,6 +7,7 @@ implemented at this stage. There will be bugs, and API changes may still occur. """ + import asyncio import dataclasses import itertools @@ -246,17 +247,17 @@ def update(self, status_cls, with_ts, with_attrs): if with_ts and self.signature_ts_validity: status_kwargs['timestamp_validity'] = self.signature_ts_validity if with_ts and self.content_ts_validity: - status_kwargs[ - 'content_timestamp_validity' - ] = self.content_ts_validity + status_kwargs['content_timestamp_validity'] = ( + self.content_ts_validity + ) if with_attrs and self.signer_attr_status: status_kwargs['ac_attrs'] = self.signer_attr_status.ac_attrs - status_kwargs[ - 'cades_signer_attrs' - ] = self.signer_attr_status.cades_signer_attrs - status_kwargs[ - 'ac_validation_errs' - ] = self.signer_attr_status.ac_validation_errs + status_kwargs['cades_signer_attrs'] = ( + self.signer_attr_status.cades_signer_attrs + ) + status_kwargs['ac_validation_errs'] = ( + self.signer_attr_status.ac_validation_errs + ) return status_cls(**status_kwargs) @@ -270,8 +271,7 @@ async def ades_timestamp_validation( timing_info: Optional[ValidationTimingInfo] = None, validation_data_handlers: Optional[ValidationDataHandlers] = None, extra_status_kwargs: Optional[Dict[str, Any]] = None, -) -> AdESBasicValidationResult: - ... +) -> AdESBasicValidationResult: ... @overload @@ -283,8 +283,7 @@ async def ades_timestamp_validation( timing_info: Optional[ValidationTimingInfo] = None, validation_data_handlers: Optional[ValidationDataHandlers] = None, extra_status_kwargs: Optional[Dict[str, Any]] = None, -) -> AdESBasicValidationResult: - ... +) -> AdESBasicValidationResult: ... async def ades_timestamp_validation( @@ -600,8 +599,7 @@ async def ades_basic_validation( validation_data_handlers: Optional[ValidationDataHandlers] = None, signature_not_before_time: Optional[datetime] = None, extra_status_kwargs: Optional[Dict[str, Any]] = None, -) -> AdESBasicValidationResult: - ... +) -> AdESBasicValidationResult: ... @overload @@ -614,8 +612,7 @@ async def ades_basic_validation( validation_data_handlers: Optional[ValidationDataHandlers] = None, signature_not_before_time: Optional[datetime] = None, extra_status_kwargs: Optional[Dict[str, Any]] = None, -) -> AdESBasicValidationResult: - ... +) -> AdESBasicValidationResult: ... async def ades_basic_validation( @@ -789,8 +786,7 @@ async def ades_with_time_validation( validation_data_handlers: Optional[ValidationDataHandlers] = None, signature_not_before_time: Optional[datetime] = None, extra_status_kwargs: Optional[Dict[str, Any]] = None, -) -> AdESWithTimeValidationResult: - ... +) -> AdESWithTimeValidationResult: ... @overload @@ -804,8 +800,7 @@ async def ades_with_time_validation( validation_data_handlers: Optional[ValidationDataHandlers] = None, signature_not_before_time: Optional[datetime] = None, extra_status_kwargs: Optional[Dict[str, Any]] = None, -) -> AdESWithTimeValidationResult: - ... +) -> AdESWithTimeValidationResult: ... async def ades_with_time_validation( diff --git a/pyhanko/sign/validation/generic_cms.py b/pyhanko/sign/validation/generic_cms.py index 9eb67e6e..482215c4 100644 --- a/pyhanko/sign/validation/generic_cms.py +++ b/pyhanko/sign/validation/generic_cms.py @@ -571,8 +571,7 @@ async def async_validate_cms_signature( validation_context: Optional[ValidationContext] = None, status_kwargs: Optional[dict] = None, key_usage_settings: Optional[KeyUsageConstraints] = None, -) -> StatusType: - ... +) -> StatusType: ... @overload @@ -583,8 +582,7 @@ async def async_validate_cms_signature( validation_context: Optional[ValidationContext] = None, status_kwargs: Optional[dict] = None, key_usage_settings: Optional[KeyUsageConstraints] = None, -) -> SignatureStatus: - ... +) -> SignatureStatus: ... async def async_validate_cms_signature( diff --git a/pyhanko/sign/validation/ltv.py b/pyhanko/sign/validation/ltv.py index 4bf4de92..f6de2102 100644 --- a/pyhanko/sign/validation/ltv.py +++ b/pyhanko/sign/validation/ltv.py @@ -345,10 +345,10 @@ async def async_validate_pdf_ltv_signature( retroactive_revinfo=retroactive ) if ac_validation_context_kwargs is not None: - ac_validation_context_kwargs[ - 'revinfo_policy' - ] = _strict_ltv_internal_revo_policy( - retroactive_revinfo=retroactive + ac_validation_context_kwargs['revinfo_policy'] = ( + _strict_ltv_internal_revo_policy( + retroactive_revinfo=retroactive + ) ) elif 'revocation_mode' not in vc_kwargs: vc_kwargs.setdefault( diff --git a/pyhanko/sign/validation/report/tools.py b/pyhanko/sign/validation/report/tools.py index 757045b3..4d117abb 100644 --- a/pyhanko/sign/validation/report/tools.py +++ b/pyhanko/sign/validation/report/tools.py @@ -114,10 +114,10 @@ def _summarise_attrs( ) ) oid = commitment_type['commitment_type_id'] - kwargs[ - 'commitment_type_indication' - ] = ts_11910202.SACommitmentTypeIndicationType( - signed=True, commitment_type_identifier=f'urn:oid:{oid.dotted}' + kwargs['commitment_type_indication'] = ( + ts_11910202.SACommitmentTypeIndicationType( + signed=True, commitment_type_identifier=f'urn:oid:{oid.dotted}' + ) ) except NonexistentAttributeError: pass @@ -148,11 +148,11 @@ def _summarise_attrs( # signature_production_place (SASignatureProductionPlaceType) if '/Location' in embedded_sig.sig_object: - kwargs[ - 'signature_production_place' - ] = ts_11910202.SASignatureProductionPlaceType( - signed=True, - address_string=(str(embedded_sig.sig_object['/Location']),), + kwargs['signature_production_place'] = ( + ts_11910202.SASignatureProductionPlaceType( + signed=True, + address_string=(str(embedded_sig.sig_object['/Location']),), + ) ) # signer_role (SASignerRoleType) if api_status.cades_signer_attrs: @@ -355,11 +355,11 @@ def _package_validation_object(vo: ValidationObject): return ts_11910202.ValidationObjectType( id=derive_validation_object_identifier(vo), object_type=vo.object_type.urn(), - validation_object_representation=ts_11910202.ValidationObjectRepresentationType( - base64=bin_data - ) - if bin_data - else None, + validation_object_representation=( + ts_11910202.ValidationObjectRepresentationType(base64=bin_data) + if bin_data + else None + ), ) diff --git a/pyhanko/sign/validation/status.py b/pyhanko/sign/validation/status.py index 1bd42879..69081e72 100644 --- a/pyhanko/sign/validation/status.py +++ b/pyhanko/sign/validation/status.py @@ -325,9 +325,9 @@ def from_results( cls, results: Iterable[ACValidationResult], parse_error_fatal=False ): # first, classify the attributes and results by type - by_type: Dict[ - str, Tuple[List[Any], List[ACValidationResult]] - ] = defaultdict(lambda: ([], [])) + by_type: Dict[str, Tuple[List[Any], List[ACValidationResult]]] = ( + defaultdict(lambda: ([], [])) + ) for result in results: for attr in result.approved_attributes.values(): attr_type = attr['type'].native diff --git a/pyhanko/stamp.py b/pyhanko/stamp.py index 4e669335..8fe7cb8c 100644 --- a/pyhanko/stamp.py +++ b/pyhanko/stamp.py @@ -7,6 +7,7 @@ The code in this module is also used by the :mod:`.sign` module to render signature appearances. """ + import enum import uuid from binascii import hexlify diff --git a/pyhanko_tests/cli_tests/test_cli_signing.py b/pyhanko_tests/cli_tests/test_cli_signing.py index 84b3e0f1..8299c212 100644 --- a/pyhanko_tests/cli_tests/test_cli_signing.py +++ b/pyhanko_tests/cli_tests/test_cli_signing.py @@ -49,9 +49,11 @@ def _write_user_key( pem_bytes = key_handle.private_bytes( encoding=serialization.Encoding.PEM, format=serialization.PrivateFormat.PKCS8, - encryption_algorithm=serialization.BestAvailableEncryption(passphrase) - if passphrase - else serialization.NoEncryption(), + encryption_algorithm=( + serialization.BestAvailableEncryption(passphrase) + if passphrase + else serialization.NoEncryption() + ), ) fname = 'signer.key.pem' diff --git a/pyhanko_tests/test_pkcs11.py b/pyhanko_tests/test_pkcs11.py index 2e0be0cd..645f3ecb 100644 --- a/pyhanko_tests/test_pkcs11.py +++ b/pyhanko_tests/test_pkcs11.py @@ -3,6 +3,7 @@ NOTE: these are not run in CI, due to lack of testing setup. """ + import asyncio import binascii from io import BytesIO diff --git a/pyhanko_tests/test_stamp.py b/pyhanko_tests/test_stamp.py index cf7285e5..e0875f7e 100644 --- a/pyhanko_tests/test_stamp.py +++ b/pyhanko_tests/test_stamp.py @@ -218,7 +218,10 @@ def test_japanese_vertical_text_stamp(): ) w = empty_page() style = QRStampStyle( - stamp_text=('テスト\n縦書きテスト\n改行してみましょう(括弧)\nPDF\n' 'ちょっと長めの文を書いてみた。'), + stamp_text=( + 'テスト\n縦書きテスト\n改行してみましょう(括弧)\nPDF\n' + 'ちょっと長めの文を書いてみた。' + ), text_box_style=TextBoxStyle(font=gaf, vertical_text=True), qr_position=QRPosition.ABOVE_TEXT, background=STAMP_ART_CONTENT,