From ec8f8a9096b239d2112089e8de540f581338fd4f Mon Sep 17 00:00:00 2001 From: =?utf8?q?Henryk=20Pl=C3=B6tz?= Date: Sun, 12 Aug 2018 23:23:25 +0200 Subject: [PATCH] Apply isort, remove unused imports --- fints/client.py | 19 ++++++++++--------- fints/connection.py | 6 +++--- fints/dialog.py | 2 +- fints/formals.py | 7 +++---- fints/hhd/flicker.py | 1 - fints/message.py | 8 +++----- fints/models.py | 2 +- fints/parser.py | 14 +++++++------- fints/segments/__init__.py | 15 ++++++++++++--- fints/segments/auth.py | 1 + fints/segments/message.py | 1 + fints/segments/statement.py | 1 + fints/utils.py | 8 +++++--- setup.py | 3 +-- tests/conftest.py | 5 ++++- tests/test_formals.py | 7 ++++++- tests/test_message_parser.py | 7 +++---- tests/test_message_serializer.py | 8 ++++---- tests/test_models.py | 10 +++++++--- 19 files changed, 73 insertions(+), 52 deletions(-) diff --git a/fints/client.py b/fints/client.py index b9f5e48..33920a4 100644 --- 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 65d7fc3..281a7f9 100644 --- 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 f7f6c4a..89d874a 100644 --- 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 82158e0..288b8ca 100644 --- 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 30ab5d2..81ba59c 100644 --- 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 f17e888..f60fe43 100644 --- 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 6709df9..4758172 100644 --- 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 2f708a3..82c2f97 100644 --- 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 3e60534..60d4097 100644 --- 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 7ea7378..157a0a4 100644 --- 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 88a6a76..ff2440b 100644 --- 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 389546d..c1d93d1 100644 --- 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 8af0849..7e64a16 100644 --- 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 9cb9846..07dc63d 100644 --- 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 9feb800..31457b4 100644 --- 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 bae78ac..9379077 100644 --- 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 c4bfc23..a98c697 100644 --- 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 e016582..ae1d75a 100644 --- 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 41c1b9c..dc9f4e4 100644 --- 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() -- 2.47.2