Apply isort, remove unused imports

diff --git a/fints/client.py b/fints/client.py
index b9f5e4873ff13ff64039a61bc5048daa5df7cb17..33920a42a3f47de67e28d98914b78c05943f4d59 100644 (file)
--- a/fints/client.py
+++ b/fints/client.py
@@ -1,26 +1,27 @@
 import datetime
 import logging
-import re
 from decimal import Decimal
 
+from fints.segments import HISPA1
+from fints.segments.debit import HKDME, HKDSE
 from mt940.models import Balance
 from sepaxml import SepaTransfer
 
-from fints.segments.debit import HKDSE, HKDME
 from .connection import FinTSHTTPSConnection
 from .dialog import FinTSDialog
+from .formals import TwoStepParametersCommon
 from .message import FinTSMessage
-from .models import SEPAAccount, TANChallenge6, TANChallenge5, TANChallenge3, TANChallenge4, TANChallenge
+from .models import (
+    SEPAAccount, TANChallenge, TANChallenge3,
+    TANChallenge4, TANChallenge5, TANChallenge6,
+)
 from .segments.accounts import HKSPA
-from .segments.auth import HKTAN, HKTAB
+from .segments.auth import HKTAB, HKTAN
 from .segments.depot import HKWPD
 from .segments.saldo import HKSAL
 from .segments.statement import HKKAZ
-from .segments.transfer import HKCCS, HKCCM
-from .formals import TwoStepParametersCommon
-from .utils import mt940_to_array, MT535_Miniparser, Password
-
-from fints.segments import HISPA1
+from .segments.transfer import HKCCM, HKCCS
+from .utils import MT535_Miniparser, Password, mt940_to_array
 
 logger = logging.getLogger(__name__)
 

diff --git a/fints/connection.py b/fints/connection.py
index 65d7fc323190eab88b83df7ce98d793a84354808..281a7f9978bc57f020038c751f47316ebf962941 100644 (file)
--- a/fints/connection.py
+++ b/fints/connection.py
@@ -1,11 +1,11 @@
 import base64
 
 import requests
+from fints.parser import FinTS3Parser
+from fints.utils import Password
 
 from .message import FinTSMessage, FinTSResponse
 
-from fints.parser import FinTS3Parser
-from fints.utils import Password
 
 class FinTSConnectionError(Exception):
     pass
@@ -32,4 +32,4 @@ class FinTSHTTPSConnection:
         with Password.protect():
             retval.print_nested()
         print("<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<")
-        return retval
\ No newline at end of file
+        return retval

diff --git a/fints/dialog.py b/fints/dialog.py
index f7f6c4a43e9a6ed4d03c86bab2b4e31933a231d8..89d874aaf32e28c41948ca00da925e3567f1e342 100644 (file)
--- a/fints/dialog.py
+++ b/fints/dialog.py
@@ -1,6 +1,6 @@
 import logging
 
-from .message import FinTSMessage, FinTSResponse
+from .message import FinTSMessage
 from .segments.auth import HKIDN, HKSYN, HKVVB
 from .segments.dialog import HKEND
 

diff --git a/fints/formals.py b/fints/formals.py
index 82158e084bb537173a2c9be9bb46fc5b447c80d6..288b8ca9c044032fd20d707d3625ec3246aca680 100644 (file)
--- a/fints/formals.py
+++ b/fints/formals.py
@@ -1,11 +1,10 @@
 import re
 import warnings
+from collections import Iterable, OrderedDict
 from contextlib import suppress
-from inspect import getmro
-from copy import deepcopy
-from collections import OrderedDict, Iterable
 
-from fints.utils import classproperty, SubclassesMixin, Password
+from fints.utils import Password, SubclassesMixin
+
 
 class ValueList:
     def __init__(self, parent):

diff --git a/fints/hhd/flicker.py b/fints/hhd/flicker.py
index 30ab5d2cf134f9bf5923a766bd549880260d703f..81ba59c61d981945a4a683772fb21c2ce2c49046 100644 (file)
--- a/fints/hhd/flicker.py
+++ b/fints/hhd/flicker.py
@@ -4,7 +4,6 @@
 # https://wiki.ccc-ffm.de/projekte:tangenerator:start#flickercode_uebertragung
 import math
 import re
-
 import time
 
 HHD_VERSION_13 = 13

diff --git a/fints/message.py b/fints/message.py
index f17e8887b11110b55bcf0b6bffc1ad545a4d08dd..f60fe438a04dd81276d6683175144835719a90af 100644 (file)
--- a/fints/message.py
+++ b/fints/message.py
@@ -1,11 +1,9 @@
-from enum import Enum
 import random
-import re
 
-from .segments.message import HNHBK, HNHBS, HNSHA, HNSHK, HNVSD, HNVSK
-from .parser import FinTS3Parser
 from .formals import SegmentSequence
-from .segments import ParameterSegment, HIRMG2, HNHBK3, HIBPA3, HISYN4, HIRMS2, HITANSBase
+from .segments import HIBPA3, HIRMG2, HIRMS2, HISYN4, HNHBK3, HITANSBase
+from .segments.message import HNHBK, HNHBS, HNSHA, HNSHK, HNVSD, HNVSK
+
 
 class FinTSMessage:
     def __init__(self, blz, username, pin, systemid, dialogid, msgno, encrypted_segments, tan_mechs=None, tan=None):

diff --git a/fints/models.py b/fints/models.py
index 6709df9b6c83a92299f3e9acd1b5c818c93cc017..4758172c98095189d8d0f0d257ae35e8a63f5c97 100644 (file)
--- a/fints/models.py
+++ b/fints/models.py
@@ -92,4 +92,4 @@ class TANChallenge6(TANChallenge):
     """
     version = 6
     args = ['tan_process', 'request_hash', 'reference', 'challenge', 'challenge_hhd_uc', 'challenge_datetime',
-            'medium_description']
\ No newline at end of file
+            'medium_description']

diff --git a/fints/parser.py b/fints/parser.py
index 2f708a3361197473759369bc43425d348d23c126..82c2f975ba4e8ee1f6bc92bf3ef9face96f830f0 100644 (file)
--- a/fints/parser.py
+++ b/fints/parser.py
@@ -1,9 +1,12 @@
-from enum import Enum
+import re
+import warnings
 from collections import Iterable
-from contextlib import suppress
-import re, warnings
+from enum import Enum
+
+from .formals import (
+    Container, DataElementGroupField, SegmentSequence, ValueList,
+)
 from .segments import FinTS3Segment
-from .formals import Container, ValueList, DataElementField, DataElementGroupField, SegmentSequence
 
 # 
 # FinTS 3.0 structure:
@@ -440,6 +443,3 @@ class FinTS3Serializer:
             return b''
         else:
             raise TypeError("Can only escape str, bytes and None")
-
-
-

diff --git a/fints/segments/__init__.py b/fints/segments/__init__.py
index 3e605341a04d6d721e4ba5eb8739df55264db677..60d4097bdba8cb4af763ebdd8ce22b6590488efd 100644 (file)
--- a/fints/segments/__init__.py
+++ b/fints/segments/__init__.py
@@ -1,8 +1,17 @@
 import re
 
-from fints.formals import Container, ContainerMeta, SegmentHeader, DataElementGroupField, DataElementField, ReferenceMessage, SegmentSequenceField, SecurityProfile, SecurityIdentificationDetails, SecurityDateTime, EncryptionAlgorithm, KeyName, Certificate, HashAlgorithm, SignatureAlgorithm, UserDefinedSignature, Response, AccountInformation, AccountLimit, AllowedTransaction, ParameterTwostepTAN1, ParameterTwostepTAN2, ParameterTwostepTAN3, ParameterTwostepTAN4, ParameterTwostepTAN5, ParameterTwostepTAN6, ParameterPinTan, SupportedLanguages2, SupportedHBCIVersions2, BankIdentifier, AccountInternational
-
-from fints.utils import classproperty, SubclassesMixin
+from fints.formals import (
+    AccountInformation, AccountInternational, AccountLimit,
+    AllowedTransaction, BankIdentifier, Certificate, Container, ContainerMeta,
+    DataElementField, DataElementGroupField, EncryptionAlgorithm,
+    HashAlgorithm, KeyName, ParameterPinTan, ParameterTwostepTAN1,
+    ParameterTwostepTAN2, ParameterTwostepTAN3, ParameterTwostepTAN4,
+    ParameterTwostepTAN5, ParameterTwostepTAN6, ReferenceMessage, Response,
+    SecurityDateTime, SecurityIdentificationDetails, SecurityProfile,
+    SegmentHeader, SegmentSequenceField, SignatureAlgorithm,
+    SupportedHBCIVersions2, SupportedLanguages2, UserDefinedSignature,
+)
+from fints.utils import SubclassesMixin, classproperty
 
 TYPE_VERSION_RE = re.compile(r'^([A-Z]+)(\d+)$')
 

diff --git a/fints/segments/auth.py b/fints/segments/auth.py
index 7ea7378c626371b9294ba293a96220ff4e1c3a94..157a0a452d65fc7f60a50b4be3fca2499a6d71d3 100644 (file)
--- a/fints/segments/auth.py
+++ b/fints/segments/auth.py
@@ -1,4 +1,5 @@
 from fints.utils import fints_escape
+
 from . import FinTS3SegmentOLD
 
 

diff --git a/fints/segments/message.py b/fints/segments/message.py
index 88a6a76fcdff921e77a72a78bd94d19775032800..ff2440b656687e746711269242219590af07f8f1 100644 (file)
--- a/fints/segments/message.py
+++ b/fints/segments/message.py
@@ -1,6 +1,7 @@
 import time
 
 from fints.utils import fints_escape
+
 from . import FinTS3SegmentOLD
 
 

diff --git a/fints/segments/statement.py b/fints/segments/statement.py
index 389546d2c0f5527b9a284835cfec874a9d09c205..c1d93d1db7c577c966bfbe89c53927169308979a 100644 (file)
--- a/fints/segments/statement.py
+++ b/fints/segments/statement.py
@@ -1,4 +1,5 @@
 from fints.utils import fints_escape
+
 from . import FinTS3SegmentOLD
 
 

diff --git a/fints/utils.py b/fints/utils.py
index 8af0849234cabb0d61a623ec93ba5b0780a26674..7e64a16dbe941937bd0dab1bc44d411232b6da05 100644 (file)
--- a/fints/utils.py
+++ b/fints/utils.py
@@ -1,8 +1,10 @@
-import mt940
 import re
-from .models import Holding
-from datetime import datetime
 from contextlib import contextmanager
+from datetime import datetime
+
+import mt940
+
+from .models import Holding
 
 
 def mt940_to_array(data):

diff --git a/setup.py b/setup.py
index 9cb98462726223ca3a229fe161db8bc2793e3bb5..07dc63d16fb2781da21c75dc24fc66698f369819 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -1,9 +1,8 @@
 from codecs import open
 from os import path
 
-from setuptools import find_packages, setup
-
 from fints import version
+from setuptools import find_packages, setup
 
 here = path.abspath(path.dirname(__file__))
 

diff --git a/tests/conftest.py b/tests/conftest.py
index 9feb8001c84e5292fe5c9bb4409a969d5f181bf9..31457b46bcfb2dda55e25b02d35a006e0bfe4828 100644 (file)
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -1,5 +1,8 @@
-import pytest, glob, os.path
+import glob
+import os.path
+
 import fints.parser
+import pytest
 
 TEST_MESSAGES = {
     os.path.basename(f).rsplit('.')[0]: open(f, 'rb').read() for f in 

diff --git a/tests/test_formals.py b/tests/test_formals.py
index bae78ac1cfcb47775b9bc783f195d8c4b3dbc43d..937907720fe9e75ab0e5c457f7f7b1bf307a9aea 100644 (file)
--- a/tests/test_formals.py
+++ b/tests/test_formals.py
@@ -1,5 +1,10 @@
 import pytest
-from fints.formals import Container, ContainerField, DataElementField, DataElementGroupField, DigitsField, NumericField, Field, SegmentSequence, SegmentHeader, AlphanumericField, GenericGroupField
+from fints.formals import (
+    AlphanumericField, Container, ContainerField, DataElementField,
+    DataElementGroupField, DigitsField, Field, GenericGroupField,
+    NumericField, SegmentHeader, SegmentSequence,
+)
+
 
 def test_container_simple():
     class A(Container):

diff --git a/tests/test_message_parser.py b/tests/test_message_parser.py
index c4bfc231a5ed39466a0da13fc0f3e34a3855b413..a98c697aa8d05e433b4204c5e77f18ddbee56bd1 100644 (file)
--- a/tests/test_message_parser.py
+++ b/tests/test_message_parser.py
@@ -1,10 +1,10 @@
+import pytest
+from conftest import TEST_MESSAGES
+from fints.formals import SegmentSequence
 from fints.message import FinTSResponse
 from fints.parser import FinTS3Parser, FinTSParserError, FinTSParserWarning
-from fints.formals import SegmentSequence
 from fints.segments import FinTS3Segment
-import pytest
 
-from conftest import TEST_MESSAGES
 
 @pytest.mark.parametrize("input_name", TEST_MESSAGES.keys())
 def test_explode(input_name):
@@ -117,4 +117,3 @@ def test_robust_mode(mock):
     with pytest.warns(FinTSParserWarning, match='^Ignoring parser error.*: Required field'):
         m = FinTS3Parser().parse_message(message1)
         assert m.segments[0].__class__ == FinTS3Segment
-

diff --git a/tests/test_message_serializer.py b/tests/test_message_serializer.py
index e016582b1f1ea54222a36e99917c6e608df925cc..ae1d75a5d57ee8ac609bc9e931aad22658b2bf2d 100644 (file)
--- a/tests/test_message_serializer.py
+++ b/tests/test_message_serializer.py
@@ -1,9 +1,9 @@
-from fints.parser import FinTS3Serializer, FinTS3Parser
-from fints.segments import FinTS3Segment
-from fints.formals import NumericField
 import pytest
-
 from conftest import TEST_MESSAGES
+from fints.formals import NumericField
+from fints.parser import FinTS3Parser, FinTS3Serializer
+from fints.segments import FinTS3Segment
+
 
 def test_serialize_1():
     class ITST1(FinTS3Segment):

diff --git a/tests/test_models.py b/tests/test_models.py
index 41c1b9c2faacb150d7c1113aa8b6596e47b19da3..dc9f4e4f33d69ea3f9932088ce36e4032a714495 100644 (file)
--- a/tests/test_models.py
+++ b/tests/test_models.py
@@ -1,8 +1,12 @@
+from io import StringIO
+
 import pytest
-from fints.segments import FinTS3Segment, HNHBK3, HNHBS1
-from fints.formals import SegmentSequence, SegmentHeader, DataElementField, GenericField, NumericField, AlphanumericField
+from fints.formals import (
+    AlphanumericField, DataElementField, GenericField,
+    NumericField, SegmentHeader, SegmentSequence,
+)
+from fints.segments import HNHBK3, HNHBS1, FinTS3Segment
 
-from io import StringIO
 
 def test_metaclass_foo():
     a = HNHBK3()