From 631c48fc153ae6cea812c12941d4fbc6d060fdd7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sat, 11 Dec 2021 17:58:45 +0100 Subject: [PATCH] Follow isort formatting issue10928 --- .isort.cfg | 3 +++ setup.py | 3 ++- trytond_gis/fields.py | 5 +++-- trytond_gis/postgis/__init__.py | 1 + trytond_gis/postgis/database.py | 5 ++--- trytond_gis/postgis/table.py | 3 +-- trytond_gis/tests/__init__.py | 1 + trytond_gis/tests/test_fields.py | 1 + 8 files changed, 14 insertions(+), 8 deletions(-) create mode 100644 .isort.cfg 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/setup.py b/setup.py index 06f2a56ff2..ce1c524c6a 100755 --- a/setup.py +++ b/setup.py @@ -4,7 +4,8 @@ import io import os import re -from setuptools import setup, find_packages + +from setuptools import find_packages, setup def read(fname): diff --git a/trytond_gis/fields.py b/trytond_gis/fields.py index d9cf72b542..051da9c1fa 100644 --- a/trytond_gis/fields.py +++ b/trytond_gis/fields.py @@ -3,11 +3,12 @@ from sql import Null from sql.operators import Not + from trytond import backend from trytond.model import fields from trytond.model.fields.field import SQL_OPERATORS - -from trytond_gis import _GeoJSON, sql as geo_sql +from trytond_gis import _GeoJSON +from trytond_gis import sql as geo_sql GEOGRAPHIC_OPERATORS = { '=': geo_sql.ST_Equals, diff --git a/trytond_gis/postgis/__init__.py b/trytond_gis/postgis/__init__.py index 5e1c9e2fd6..a82918719f 100644 --- a/trytond_gis/postgis/__init__.py +++ b/trytond_gis/postgis/__init__.py @@ -2,6 +2,7 @@ # this repository contains the full copyright notices and license terms. from trytond.backend.postgresql.database import ( DatabaseIntegrityError, DatabaseOperationalError) + from .database import Database from .table import TableHandler diff --git a/trytond_gis/postgis/database.py b/trytond_gis/postgis/database.py index a35dfb9e90..5f63d59c68 100644 --- a/trytond_gis/postgis/database.py +++ b/trytond_gis/postgis/database.py @@ -3,12 +3,11 @@ import binascii from geomet import wkb -from psycopg2.extensions import (register_adapter, new_type, register_type, - Binary) +from psycopg2.extensions import ( + Binary, new_type, register_adapter, register_type) from trytond.backend.postgresql.database import Database as PGDatabase from trytond.config import parse_uri - from trytond_gis import _GeoJSON diff --git a/trytond_gis/postgis/table.py b/trytond_gis/postgis/table.py index c7cdab100f..b09953aa88 100644 --- a/trytond_gis/postgis/table.py +++ b/trytond_gis/postgis/table.py @@ -2,10 +2,9 @@ # this repository contains the full copyright notices and license terms. import logging +from trytond.backend.postgresql.table import TableHandler as PGTableHandler from trytond.config import config from trytond.transaction import Transaction -from trytond.backend.postgresql.table import TableHandler as PGTableHandler - from trytond_gis.const import GIS_SQL_TYPE_RE, WGS_84 logger = logging.getLogger(__name__) diff --git a/trytond_gis/tests/__init__.py b/trytond_gis/tests/__init__.py index ee61f7caf2..6fd6f81d41 100644 --- a/trytond_gis/tests/__init__.py +++ b/trytond_gis/tests/__init__.py @@ -2,6 +2,7 @@ # this repository contains the full copyright notices and license terms. from trytond.pool import Pool + from . import gis diff --git a/trytond_gis/tests/test_fields.py b/trytond_gis/tests/test_fields.py index 85b6cc300a..34a9b46f09 100644 --- a/trytond_gis/tests/test_fields.py +++ b/trytond_gis/tests/test_fields.py @@ -1,6 +1,7 @@ # This file is part of trytond_gis. The COPYRIGHT file at the top level of # this repository contains the full copyright notices and license terms. import unittest + from sql import Null from trytond.pool import Pool