From 360f4aee80f157b1533f07e53c293618ebaeeb20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sun, 1 Mar 2020 12:33:52 +0100 Subject: [PATCH] Fix flake8 errors and warnings We add the flake8 configuration used so we ensure everyone uses the same. We remove the usage of __all__ for non public API. When possible, we rationalize the class name according to its __name__ and module. issue9082 review297061002 --- .flake8 | 2 ++ __init__.py | 8 ++++---- country.py | 2 -- setup.py | 9 +++++---- 4 files changed, 11 insertions(+), 10 deletions(-) create mode 100644 .flake8 diff --git a/.flake8 b/.flake8 new file mode 100644 index 0000000000..bb03d08a82 --- /dev/null +++ b/.flake8 @@ -0,0 +1,2 @@ +[flake8] +ignore=E123,E124,E126,E128,W503 diff --git a/__init__.py b/__init__.py index a6d83cfdd1..8eac12750e 100644 --- a/__init__.py +++ b/__init__.py @@ -2,12 +2,12 @@ # this repository contains the full copyright notices and license terms. from trytond.pool import Pool -from .country import * +from . import country def register(): Pool.register( - Country, - Subdivision, - Zip, + country.Country, + country.Subdivision, + country.Zip, module='country', type_='model') diff --git a/country.py b/country.py index 6305294045..ec7cc8c00f 100644 --- a/country.py +++ b/country.py @@ -6,8 +6,6 @@ from trytond.pyson import Eval from trytond.transaction import Transaction from trytond.tools import lstrip_wildcard -__all__ = ['Country', 'Subdivision', 'Zip'] - class Country(DeactivableMixin, ModelSQL, ModelView): 'Country' diff --git a/setup.py b/setup.py index 83c8ca0e6a..5e783a156e 100755 --- a/setup.py +++ b/setup.py @@ -79,8 +79,8 @@ setup(name=name, keywords='tryton country', package_dir={'trytond.modules.country': '.'}, packages=( - ['trytond.modules.country'] + - ['trytond.modules.country.%s' % p for p in find_packages()] + ['trytond.modules.country'] + + ['trytond.modules.country.%s' % p for p in find_packages()] ), package_data={ 'trytond.modules.country': (info.get('xml', []) @@ -95,7 +95,8 @@ setup(name=name, 'Intended Audience :: Financial and Insurance Industry', 'Intended Audience :: Legal Industry', 'Intended Audience :: Manufacturing', - 'License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)', + 'License :: OSI Approved :: ' + 'GNU General Public License v3 or later (GPLv3+)', 'Natural Language :: Bulgarian', 'Natural Language :: Catalan', 'Natural Language :: Chinese (Simplified)', @@ -139,7 +140,7 @@ setup(name=name, [console_scripts] trytond_import_countries = trytond.modules.country.scripts.import_countries:run [data] trytond_import_zip = trytond.modules.country.scripts.import_zip:run [GeoNames] - """, + """, # noqa: E501 test_suite='tests', test_loader='trytond.test_loader:Loader', tests_require=tests_require,