diff --git a/.isort.cfg b/.isort.cfg new file mode 100644 index 0000000000..e1c6495da9 --- /dev/null +++ b/.isort.cfg @@ -0,0 +1,3 @@ +[settings] +multi_line_output=4 +known_first_party=trytond diff --git a/__init__.py b/__init__.py index c3e6599f88..fe99eb38d3 100644 --- a/__init__.py +++ b/__init__.py @@ -1,10 +1,8 @@ # This file is part of Tryton. The COPYRIGHT file at the top level of # this repository contains the full copyright notices and license terms. from trytond.pool import Pool -from . import account -from . import party -from . import reporting_tax -from . import account_payment + +from . import account, account_payment, party, reporting_tax def register(): diff --git a/account.py b/account.py index 173d056fd0..d2157a6bbc 100644 --- a/account.py +++ b/account.py @@ -1,7 +1,7 @@ # This file is part of Tryton. The COPYRIGHT file at the top level of # this repository contains the full copyright notices and license terms. from trytond.model import fields -from trytond.pool import PoolMeta, Pool +from trytond.pool import Pool, PoolMeta from trytond.pyson import Bool, Eval from trytond.transaction import Transaction diff --git a/reporting_tax.py b/reporting_tax.py index f8207e444a..cf609b0396 100644 --- a/reporting_tax.py +++ b/reporting_tax.py @@ -2,35 +2,34 @@ # this repository contains the full copyright notices and license terms. import csv import unicodedata -from io import BytesIO, TextIOWrapper - from collections import defaultdict -from dateutil.relativedelta import relativedelta from decimal import Decimal +from io import BytesIO, TextIOWrapper from operator import attrgetter -from sql import Cast, Null, Literal +from dateutil.relativedelta import relativedelta +# XXX fix: https://genshi.edgewall.org/ticket/582 +from genshi.template.astutil import ASTCodeGenerator, ASTTransformer +from sql import Cast, Literal, Null from sql.aggregate import Count, Min, Sum from sql.conditionals import Case, Coalesce -from sql.functions import Substring, Position, Extract, CurrentTimestamp +from sql.functions import CurrentTimestamp, Extract, Position, Substring from sql.operators import Exists from trytond.i18n import gettext from trytond.model import ModelSQL, ModelView, fields from trytond.model.modelsql import convert_from +from trytond.modules.account_eu.account import ECSalesList, ECSalesListContext +from trytond.modules.currency.fields import Monetary from trytond.pool import Pool from trytond.pyson import Eval, If from trytond.report import Report from trytond.transaction import Transaction -from trytond.wizard import Wizard, StateView, StateTransition, StateReport, \ - Button -from trytond.modules.account_eu.account import ECSalesList, ECSalesListContext -from trytond.modules.currency.fields import Monetary +from trytond.wizard import ( + Button, StateReport, StateTransition, StateView, Wizard) from .exceptions import PrintError -# XXX fix: https://genshi.edgewall.org/ticket/582 -from genshi.template.astutil import ASTCodeGenerator, ASTTransformer if not hasattr(ASTCodeGenerator, 'visit_NameConstant'): def visit_NameConstant(self, node): if node.value is None: diff --git a/setup.py b/setup.py index f594bb47c2..1da0727a50 100755 --- a/setup.py +++ b/setup.py @@ -6,7 +6,8 @@ import io import os import re from configparser import ConfigParser -from setuptools import setup, find_packages + +from setuptools import find_packages, setup def read(fname): diff --git a/tests/test_account_es.py b/tests/test_account_es.py index aa9a2067b7..36d11164ab 100644 --- a/tests/test_account_es.py +++ b/tests/test_account_es.py @@ -1,12 +1,11 @@ # This file is part of Tryton. The COPYRIGHT file at the top level of # this repository contains the full copyright notices and license terms. -import unittest import doctest +import unittest import trytond.tests.test_tryton -from trytond.tests.test_tryton import ModuleTestCase -from trytond.tests.test_tryton import doctest_teardown -from trytond.tests.test_tryton import doctest_checker +from trytond.tests.test_tryton import ( + ModuleTestCase, doctest_checker, doctest_teardown) class AccountTestCase(ModuleTestCase):