Run isort

diff --git a/fints/client.py b/fints/client.py
index 119222a6b2746196c7e76260cb8821a1250bab59..4554b8dcd3371e273dd0f369c6deb8ac5e1683c7 100644 (file)
--- a/fints/client.py
+++ b/fints/client.py
@@ -7,24 +7,29 @@ from mt940.models import Balance
 from sepaxml import SepaTransfer
 
 from .connection import FinTSHTTPSConnection
-from .dialog import FinTSDialogOLD, FinTSDialog
-from .formals import TwoStepParametersCommon
+from .dialog import FinTSDialog, FinTSDialogOLD
+from .formals import (
+    KTI1, Account3, BankIdentifier,
+    SynchronisationMode, TwoStepParametersCommon,
+)
 from .message import FinTSMessageOLD
-from .security import PinTanDummyEncryptionMechanism, PinTanOneStepAuthenticationMechanism, PinTanTwoStepAuthenticationMechanism
 from .models import (
     SEPAAccount, TANChallenge, TANChallenge3,
     TANChallenge4, TANChallenge5, TANChallenge6,
 )
-from .segments import HIUPA4, HIBPA3, HIRMS2
-from .segments.accounts import HKSPA, HKSPA1, HISPA1
+from .security import (
+    PinTanDummyEncryptionMechanism, PinTanOneStepAuthenticationMechanism,
+    PinTanTwoStepAuthenticationMechanism,
+)
+from .segments import HIBPA3, HIRMS2, HIUPA4
+from .segments.accounts import HISPA1, HKSPA, HKSPA1
 from .segments.auth import HKTAB, HKTAN
-from .segments.dialog import HKSYN3, HISYN4
 from .segments.depot import HKWPD
-from .segments.saldo import HKSAL5, HKSAL6, HKSAL7, HISAL5, HISAL6, HISAL7
+from .segments.dialog import HISYN4, HKSYN3
+from .segments.saldo import HISAL5, HISAL6, HISAL7, HKSAL5, HKSAL6, HKSAL7
 from .segments.statement import HKKAZ
 from .segments.transfer import HKCCM, HKCCS
 from .utils import MT535_Miniparser, Password, mt940_to_array
-from .formals import Account3, KTI1, BankIdentifier, SynchronisationMode
 
 logger = logging.getLogger(__name__)
 

diff --git a/fints/connection.py b/fints/connection.py
index 69b3e6d20bc7b667b4731e3b0472e5ab170351da..aeb35252e6fe0445cc63cb998e1b79b8922c63b6 100644 (file)
--- a/fints/connection.py
+++ b/fints/connection.py
@@ -4,7 +4,7 @@ import requests
 from fints.parser import FinTS3Parser
 from fints.utils import Password
 
-from .message import FinTSMessage, FinTSInstituteMessage
+from .message import FinTSInstituteMessage, FinTSMessage
 
 
 class FinTSConnectionError(Exception):

diff --git a/fints/dialog.py b/fints/dialog.py
index 8092457648c019e8a1642ff5c58ae714e7c1e61e..2d25fc20f50225e08402bb885f54080ad9da7bc2 100644 (file)
--- a/fints/dialog.py
+++ b/fints/dialog.py
@@ -1,11 +1,14 @@
 import logging
 
-from .message import FinTSMessageOLD, MessageDirection, FinTSMessage, FinTSCustomerMessage
-from .segments.auth import HKIDN, HKSYN, HKVVB
+from .formals import (
+    BankIdentifier, Language2, SynchronisationMode, SystemIDStatus,
+)
+from .message import (
+    FinTSCustomerMessage, FinTSMessage, FinTSMessageOLD, MessageDirection,
+)
+from .segments.auth import HKIDN, HKIDN2, HKSYN, HKVVB, HKVVB3
 from .segments.dialog import HKEND, HKEND1
-from .segments.auth import HKIDN2, HKVVB3
 from .segments.message import HNHBK3, HNHBS1
-from .formals import BankIdentifier, SystemIDStatus, Language2, SynchronisationMode
 
 logger = logging.getLogger(__name__)
 

diff --git a/fints/formals.py b/fints/formals.py
index 550596fa44eb20aadbbaa125aacd7806d9d348df..dfc70cfb4759c3933f6b5957973e20115499bfe0 100644 (file)
--- a/fints/formals.py
+++ b/fints/formals.py
@@ -4,6 +4,7 @@ from fints.types import *  # The order is important!
 from fints.fields import *
 from fints.utils import RepresentableEnum, ShortReprMixin
 
+
 class DataElementGroup(Container):
     pass
 

diff --git a/fints/message.py b/fints/message.py
index 7287c4348bbf48f7504dd980db2a8209100bb44c..67ebfeec828490de6aebcdc35c42a745439c8307 100644 (file)
--- a/fints/message.py
+++ b/fints/message.py
@@ -2,9 +2,10 @@ import random
 from enum import Enum
 
 from .formals import SegmentSequence
-from .segments import FinTS3Segment, HIBPA3, HIRMG2, HIRMS2, HITANSBase
+from .segments import HIBPA3, HIRMG2, HIRMS2, FinTS3Segment, HITANSBase
 from .segments.message import HNHBK3, HNHBS1, HNSHA, HNSHK, HNVSD, HNVSK
 
+
 class MessageDirection(Enum):
     FROM_CUSTOMER = 1
     FROM_INSTITUTE = 2

diff --git a/fints/security.py b/fints/security.py
index 68acc5f105487d5696683d5fcaeb899feb338e89..7ea80e0e321dd10c4eef75504f49b7301d5e66a6 100644 (file)
--- a/fints/security.py
+++ b/fints/security.py
@@ -1,9 +1,18 @@
-import datetime, random
-
+import datetime
+import random
+
+from .formals import (
+    AlgorithmParameterIVName, AlgorithmParameterName, CompressionFunction,
+    DateTimeType, EncryptionAlgorithm, EncryptionAlgorithmCoded,
+    HashAlgorithm, IdentifiedRole, KeyName, KeyType, OperationMode,
+    SecurityApplicationArea, SecurityDateTime,
+    SecurityIdentificationDetails, SecurityMethod, SecurityProfile,
+    SecurityRole, SignatureAlgorithm, UsageEncryption, UserDefinedSignature,
+)
 from .message import FinTSMessage
+from .segments.message import HNSHA2, HNSHK4, HNVSD1, HNVSK3
 from .types import SegmentSequence
-from .formals import SecurityProfile, SecurityRole, IdentifiedRole, DateTimeType, UsageEncryption, SecurityIdentificationDetails, SecurityDateTime, EncryptionAlgorithm, KeyName, CompressionFunction, OperationMode, EncryptionAlgorithmCoded, AlgorithmParameterName, AlgorithmParameterIVName, KeyType, SecurityMethod, SecurityApplicationArea, UserDefinedSignature, HashAlgorithm, SignatureAlgorithm, UserDefinedSignature
-from .segments.message import HNVSK3, HNVSD1, HNSHK4, HNSHA2
+
 
 class EncryptionMechanism:
     def encrypt(self, message: FinTSMessage):

diff --git a/fints/segments/__init__.py b/fints/segments/__init__.py
index 4f018fad8846c704eeb03eed4ccccf7bc77c9857..3fb0cd9d2884201b795ce78d41c9446955928e06 100644 (file)
--- a/fints/segments/__init__.py
+++ b/fints/segments/__init__.py
@@ -1,18 +1,18 @@
 import re
 
+from fints.fields import CodeField, IntCodeField
 from fints.formals import (
-    AccountInformation, KTZ1, AccountLimit,
-    AllowedTransaction, BankIdentifier, Certificate, Container, ContainerMeta,
-    DataElementField, DataElementGroupField, EncryptionAlgorithm,
-    HashAlgorithm, KeyName, ParameterPinTan, ParameterTwostepTAN1,
-    ParameterTwostepTAN2, ParameterTwostepTAN3, ParameterTwostepTAN4,
-    ParameterTwostepTAN5, ParameterTwostepTAN6, ReferenceMessage, Response,
-    SecurityDateTime, SecurityIdentificationDetails, SecurityProfile, SecurityRole,
-    SegmentHeader, SegmentSequenceField, SignatureAlgorithm,
-    SupportedHBCIVersions2, SupportedLanguages2, UserDefinedSignature,
-    CompressionFunction, SecurityApplicationArea, SecurityClass, UPDUsage
+    KTZ1, AccountInformation, AccountLimit, AllowedTransaction, BankIdentifier,
+    Certificate, CompressionFunction, Container, ContainerMeta,
+    DataElementField, DataElementGroupField, EncryptionAlgorithm, HashAlgorithm,
+    KeyName, ParameterPinTan, ParameterTwostepTAN1, ParameterTwostepTAN2,
+    ParameterTwostepTAN3, ParameterTwostepTAN4, ParameterTwostepTAN5,
+    ParameterTwostepTAN6, ReferenceMessage, Response, SecurityApplicationArea,
+    SecurityClass, SecurityDateTime, SecurityIdentificationDetails,
+    SecurityProfile, SecurityRole, SegmentHeader, SegmentSequenceField,
+    SignatureAlgorithm, SupportedHBCIVersions2, SupportedLanguages2, UPDUsage,
+    UserDefinedSignature,
 )
-from fints.fields import CodeField, IntCodeField
 from fints.utils import SubclassesMixin, classproperty
 
 TYPE_VERSION_RE = re.compile(r'^([A-Z]+)(\d+)$')
@@ -160,4 +160,6 @@ class HIBPA3(FinTS3Segment):
     min_timeout = DataElementField(type='num', max_length=4, required=False, _d="Minimaler Timeout-Wert")
     max_timeout = DataElementField(type='num', max_length=4, required=False, _d="Maximaler Timeout-Wert")
 
-from . import accounts, auth, debit, depot, dialog, message, saldo, statement, transfer
+from . import (
+    accounts, auth, debit, depot, dialog, message, saldo, statement, transfer,
+)

diff --git a/fints/segments/accounts.py b/fints/segments/accounts.py
index aa668aaff18202876eda3cda4a70afbd68282dc7..44bf354383b0d4dbe173d905102a3516bb1be7dd 100644 (file)
--- a/fints/segments/accounts.py
+++ b/fints/segments/accounts.py
@@ -1,8 +1,8 @@
-from . import FinTS3SegmentOLD, FinTS3Segment
-
+from . import FinTS3Segment, FinTS3SegmentOLD
 from ..fields import DataElementGroupField
 from ..formals import KTZ1, Account3
 
+
 class HKSPA(FinTS3SegmentOLD):
     """
     HKSPA (SEPA-Kontoverbindung anfordern)
@@ -33,4 +33,3 @@ class HISPA1(FinTS3Segment):
     Source: FinTS Financial Transaction Services, Schnittstellenspezifikation, Messages -- Multibankfähige Geschäftsvorfälle 
     """
     accounts = DataElementGroupField(type=KTZ1, max_count=999, required=False, _d="SEPA-Kontoverbindung")
-

diff --git a/fints/segments/auth.py b/fints/segments/auth.py
index de77e6a05846d3f0017e8584598c88146fe12ef9..1f0cfbd666d549022061e14c5156b0dcabf49a40 100644 (file)
--- a/fints/segments/auth.py
+++ b/fints/segments/auth.py
@@ -1,8 +1,11 @@
+from fints.fields import CodeField, DataElementField, DataElementGroupField
+from fints.formals import (
+    BankIdentifier, Language2, SynchronisationMode, SystemIDStatus,
+)
 from fints.utils import fints_escape
 
-from . import FinTS3SegmentOLD, FinTS3Segment
-from fints.formals import BankIdentifier, SystemIDStatus, Language2, SynchronisationMode
-from fints.fields import DataElementGroupField, DataElementField, CodeField
+from . import FinTS3Segment, FinTS3SegmentOLD
+
 
 class HKIDN(FinTS3SegmentOLD):
     """

diff --git a/fints/segments/dialog.py b/fints/segments/dialog.py
index 97b9913cbbf8511debbba4013c1665b74546efad..ab90fda5bf152282b01751425ad05f0826091bae 100644 (file)
--- a/fints/segments/dialog.py
+++ b/fints/segments/dialog.py
@@ -1,9 +1,8 @@
-from . import FinTS3SegmentOLD
-
-from . import FinTS3Segment
+from . import FinTS3Segment, FinTS3SegmentOLD
 from ..fields import CodeField, DataElementField
 from ..formals import SynchronisationMode
 
+
 class HKSYN3(FinTS3Segment):
     """Synchronisierung, version 3
 

diff --git a/fints/segments/message.py b/fints/segments/message.py
index 71cb1f9433eb3c7569447ff66b6f294ee2272f75..e23439b73fc7fc83cebc35726fc6391c17d8e7da 100644 (file)
--- a/fints/segments/message.py
+++ b/fints/segments/message.py
@@ -1,10 +1,19 @@
 import time
 
+from fints.fields import (
+    CodeField, DataElementField, DataElementGroupField,
+    SegmentSequenceField, ZeroPaddedNumericField,
+)
+from fints.formals import (
+    Certificate, CompressionFunction, EncryptionAlgorithm,
+    HashAlgorithm, KeyName, ReferenceMessage, SecurityApplicationArea,
+    SecurityDateTime, SecurityIdentificationDetails, SecurityProfile,
+    SecurityRole, SignatureAlgorithm, UserDefinedSignature,
+)
 from fints.utils import fints_escape
 
-from . import FinTS3SegmentOLD, FinTS3Segment
-from fints.formals import ReferenceMessage, SecurityProfile, SecurityRole, SecurityIdentificationDetails, SecurityDateTime, EncryptionAlgorithm, KeyName, CompressionFunction, Certificate, SecurityApplicationArea, HashAlgorithm, SignatureAlgorithm, UserDefinedSignature
-from fints.fields import DataElementGroupField, DataElementField, ZeroPaddedNumericField, CodeField, SegmentSequenceField
+from . import FinTS3Segment, FinTS3SegmentOLD
+
 
 class HNHBK3(FinTS3Segment):
     "Nachrichtenkopf"
@@ -202,4 +211,3 @@ class HNSHA2(FinTS3Segment):
     security_reference = DataElementField(type='an', max_length=14, _d="Sicherheitskontrollreferenz")
     validation_result = DataElementField(type='bin', max_length=512, required=False, _d="Validierungsresultat")
     user_defined_signature = DataElementGroupField(type=UserDefinedSignature, required=False, _d="Benutzerdefinierte Signatur")
-

diff --git a/fints/segments/saldo.py b/fints/segments/saldo.py
index d211c184939f9822a69116633a66bb56afdd352e..237ba514608fcccc475f0c72cebe83a70f389c62 100644 (file)
--- a/fints/segments/saldo.py
+++ b/fints/segments/saldo.py
@@ -1,7 +1,9 @@
-from . import FinTS3SegmentOLD, FinTS3Segment
+from fints.fields import DataElementField, DataElementGroupField
+from fints.formals import (
+    KTI1, Account2, Account3, Amount1, Balance1, Balance2, Timestamp1,
+)
 
-from fints.formals import Account2, Account3, KTI1, Balance1, Balance2, Amount1, Timestamp1
-from fints.fields import DataElementGroupField, DataElementField
+from . import FinTS3Segment, FinTS3SegmentOLD
 
 
 class HKSAL(FinTS3SegmentOLD):

diff --git a/fints/utils.py b/fints/utils.py
index f92faada42cd29977843d9a568fbfb09ab2420cc..20a370ea7f0b03cdf500e98038a92a68999e4011 100644 (file)
--- a/fints/utils.py
+++ b/fints/utils.py
@@ -277,4 +277,3 @@ class RepresentableEnum(Enum):
 
     def __str__(self):
         return self.value
-

diff --git a/tests/test_models.py b/tests/test_models.py
index 7ca30101554d252049cff17d4b4c28073208ba39..6520026b9283431e04b9a466b5c2e4a669990e9c 100644 (file)
--- a/tests/test_models.py
+++ b/tests/test_models.py
@@ -6,7 +6,7 @@ from fints.formals import (
     NumericField, SegmentHeader, SegmentSequence,
 )
 from fints.segments import FinTS3Segment
-from fints.segments.message import HNHBK3, HNHBS1 
+from fints.segments.message import HNHBK3, HNHBS1
 
 
 def test_metaclass_foo():