chore: Use black profile for isort

- Avoid not really needed customization of isort configuration - Move it to pyproject.toml
nijel · Apr 19, 2023 · 615ffb1 · 615ffb1
1 parent 9749e56
commit 615ffb1
Show file tree

Hide file tree

Showing 106 changed files with 24 additions and 134 deletions.
diff --git a/docs/conf.py b/docs/conf.py
@@ -13,7 +13,6 @@
 import os
 import sys
 
-
 sys.path.insert(0, os.path.abspath("_ext"))
 sys.path.insert(0, os.path.abspath("."))
 sys.path.insert(0, os.path.abspath(".."))

diff --git a/pyproject.toml b/pyproject.toml
@@ -4,3 +4,8 @@ requires = [
     "setuptools_scm>=6.2"
 ]
 build-backend = "setuptools.build_meta"
+
+[tool.isort]
+profile = "black"
+known_third_party=[
+    "iniparse","lxml","vobject","sphinx","pytest","cheroot","phply","bs4","ruamel","pyparsing","setuptools"]
diff --git a/setup.cfg b/setup.cfg
@@ -221,28 +221,3 @@ per-file-ignores =
   translate/storage/placeables/__init__.py:F401,F403
   translate/storage/po.py:F401,F403
   translate/storage/wordfast.py:E262
-
-[isort]
-# Settings:
-# https://github.com/timothycrosley/isort/wiki/isort-Settings#full-reference-of-isort-settings
-
-# black compatible settings:
-multi_line_output = 3
-include_trailing_comma = True
-force_grid_wrap = 0
-use_parentheses = True
-ensure_newline_before_comments = True
-line_length = 88
-
-known_standard_library=
-known_third_party=iniparse,lxml,vobject,sphinx,pytest,cheroot,phply,bs4,ruamel,pyparsing,setuptools
-known_first_party=translate
-default_section=FIRSTPARTY
-sections=FUTURE,STDLIB,THIRDPARTY,FIRSTPARTY,LOCALFOLDER
-# Separate sections within "from" imports for CONSTANTS, Classes, and
-# modules/functions.
-order_by_type=True
-# Combine as imports on the same line within for import statements. By default
-# isort forces all as imports to display on their own lines.
-combine_as_imports=True
-lines_after_imports=2
diff --git a/tests/odf_xliff/test_odf_xliff.py b/tests/odf_xliff/test_odf_xliff.py
@@ -25,7 +25,6 @@
 
 from lxml import etree
 
-
 # get directory of this test
 dir = os.path.dirname(os.path.abspath(__file__))
 # get top-level directory (moral equivalent of ../..)

diff --git a/tests/xliff_conformance/test_xliff_conformance.py b/tests/xliff_conformance/test_xliff_conformance.py
@@ -22,7 +22,6 @@
 
 from lxml import etree
 
-
 schema = None
 
 

diff --git a/tools/mozilla/buildxpi.py b/tools/mozilla/buildxpi.py
@@ -50,7 +50,6 @@
 from subprocess import PIPE, CalledProcessError, Popen
 from tempfile import mkdtemp
 
-
 logger = logging.getLogger(__name__)
 
 

diff --git a/tools/mozilla/get_moz_enUS.py b/tools/mozilla/get_moz_enUS.py
@@ -21,7 +21,6 @@
 import shutil
 from configparser import ConfigParser, NoSectionError
 
-
 srccheckout = "mozilla"
 l10ncheckout = "l10n"
 product = "browser"

diff --git a/tools/mozilla/moz_l10n_builder.py b/tools/mozilla/moz_l10n_builder.py
@@ -34,7 +34,6 @@
 import time
 from subprocess import PIPE, Popen
 
-
 join = os.path.join
 
 try:

diff --git a/tools/mozilla/mozcronbuild.py b/tools/mozilla/mozcronbuild.py
@@ -21,7 +21,6 @@
 
 from tools.mozilla import moz_l10n_builder
 
-
 MOZDIR = os.path.join(os.path.expanduser("~"), "mozbuild")
 
 

diff --git a/translate/convert/accesskey.py b/translate/convert/accesskey.py
@@ -21,7 +21,6 @@
 
 from translate.storage.placeables.general import XMLEntityPlaceable
 
-
 DEFAULT_ACCESSKEY_MARKER = "&"
 
 

diff --git a/translate/convert/convert.py b/translate/convert/convert.py
@@ -25,7 +25,6 @@
 
 from translate.misc import optrecurse
 
-
 # Don't import optparse ourselves, get the version from optrecurse.
 optparse = optrecurse.optparse
 

diff --git a/translate/convert/csv2po.py b/translate/convert/csv2po.py
@@ -26,7 +26,6 @@
 
 from translate.storage import csvl10n, po
 
-
 logger = logging.getLogger(__name__)
 
 

diff --git a/translate/convert/factory.py b/translate/convert/factory.py
@@ -20,7 +20,6 @@
 
 import os
 
-
 # from translate.convert import prop2po, po2prop, odf2xliff, xliff2odf
 
 

diff --git a/translate/convert/json2po.py b/translate/convert/json2po.py
@@ -26,7 +26,6 @@
 
 from translate.storage import po
 
-
 logger = logging.getLogger(__name__)
 
 

diff --git a/translate/convert/mozlang2po.py b/translate/convert/mozlang2po.py
@@ -23,7 +23,8 @@
 """
 
 from translate.convert import convert
-from translate.storage import mozilla_lang as lang, po
+from translate.storage import mozilla_lang as lang
+from translate.storage import po
 
 
 class lang2po:

diff --git a/translate/convert/oo2po.py b/translate/convert/oo2po.py
@@ -28,7 +28,6 @@
 
 from translate.storage import oo, po
 
-
 # TODO: support using one GSI file as template, another as input (for when English is in one and translation in another)
 
 logger = logging.getLogger(__name__)

diff --git a/translate/convert/oo2xliff.py b/translate/convert/oo2xliff.py
@@ -27,7 +27,6 @@
 
 from translate.storage import oo, xliff
 
-
 # TODO: support using one GSI file as template, another as input (for when English is in one and translation in another)
 
 logger = logging.getLogger(__name__)

diff --git a/translate/convert/po2oo.py b/translate/convert/po2oo.py
@@ -30,7 +30,6 @@
 from translate.filters import autocorrect, checks, pofilter
 from translate.storage import factory, oo
 
-
 logger = logging.getLogger(__name__)
 
 

diff --git a/translate/convert/po2php.py b/translate/convert/po2php.py
@@ -25,7 +25,6 @@
 from translate.convert import convert
 from translate.storage import php, po
 
-
 eol = "\n"
 
 

diff --git a/translate/convert/po2prop.py b/translate/convert/po2prop.py
@@ -28,7 +28,6 @@
 from translate.misc import quote
 from translate.storage import po, properties
 
-
 eol = "\n"
 
 

diff --git a/translate/convert/po2rc.py b/translate/convert/po2rc.py
@@ -32,7 +32,6 @@
     generate_popup_pre_name,
 )
 
-
 NL = "\r\n"
 BLOCK_START = "BEGIN"
 BLOCK_END = "END"

diff --git a/translate/convert/prop2po.py b/translate/convert/prop2po.py
@@ -27,7 +27,6 @@
 from translate.convert.accesskey import UnitMixer
 from translate.storage import po, properties
 
-
 logger = logging.getLogger(__name__)
 
 

diff --git a/translate/convert/rc2po.py b/translate/convert/rc2po.py
@@ -26,7 +26,6 @@
 
 from translate.storage import po, rc
 
-
 logger = logging.getLogger(__name__)
 
 

diff --git a/translate/convert/resx2po.py b/translate/convert/resx2po.py
@@ -27,7 +27,6 @@
 
 from translate.storage import po
 
-
 logger = logging.getLogger(__name__)
 
 

diff --git a/translate/convert/sub2po.py b/translate/convert/sub2po.py
@@ -26,7 +26,6 @@
 
 from translate.storage import po
 
-
 logger = logging.getLogger(__name__)
 
 

diff --git a/translate/convert/test_convert.py b/translate/convert/test_convert.py
@@ -6,7 +6,6 @@
 
 from translate.convert import convert
 
-
 OPTION_RE = re.compile(r"^\s*-")
 
 

diff --git a/translate/convert/test_ini2po.py b/translate/convert/test_ini2po.py
@@ -4,7 +4,6 @@
 
 from translate.convert import ini2po, test_convert
 
-
 importorskip("iniparse")
 
 

diff --git a/translate/convert/test_po2ini.py b/translate/convert/test_po2ini.py
@@ -4,7 +4,6 @@
 
 from translate.convert import po2ini, test_convert
 
-
 importorskip("iniparse")
 
 

diff --git a/translate/convert/test_po2rc.py b/translate/convert/test_po2rc.py
@@ -1,7 +1,6 @@
 from translate.convert import po2rc, test_convert
 from translate.storage.rc import rcfile
 
-
 RC_SOURCE = r"""
 #include "other_file.h" // This must be ignored
 

diff --git a/translate/convert/test_po2sub.py b/translate/convert/test_po2sub.py
@@ -5,7 +5,6 @@
 from translate.convert import po2sub, test_convert
 from translate.storage import po
 
-
 # Technically subtitles can also use an older gaupol
 importorskip("aeidon")
 

diff --git a/translate/convert/test_rc2po.py b/translate/convert/test_rc2po.py
@@ -1,7 +1,6 @@
 from translate.convert import rc2po, test_convert
 from translate.storage.po import pofile
 
-
 RC_SOURCE = r"""
 #include "other_file.h" // This must be ignored
 

diff --git a/translate/convert/xliff2oo.py b/translate/convert/xliff2oo.py
@@ -29,7 +29,6 @@
 from translate.filters import autocorrect, checks, pofilter
 from translate.storage import factory, oo
 
-
 logger = logging.getLogger(__name__)
 
 

diff --git a/translate/filters/checks.py b/translate/filters/checks.py
@@ -35,7 +35,6 @@
 from translate.filters.decorators import cosmetic, critical, extraction, functional
 from translate.lang import data, factory
 
-
 logger = logging.getLogger(__name__)
 
 # These are some regular expressions that are compiled for use in some tests

diff --git a/translate/filters/spelling.py b/translate/filters/spelling.py
@@ -22,14 +22,14 @@
 import logging
 from functools import lru_cache
 
-
 logger = logging.getLogger(__name__)
 
 available = False
 
 try:
     # Enchant
-    from enchant import Error as EnchantError, checker
+    from enchant import Error as EnchantError
+    from enchant import checker
 
     available = True
     checkers = {}

diff --git a/translate/lang/af.py b/translate/lang/af.py
@@ -26,7 +26,6 @@
 
 from translate.lang import common
 
-
 articlere = re.compile(r"'n\b")
 
 

diff --git a/translate/lang/common.py b/translate/lang/common.py
@@ -64,7 +64,6 @@
 
 from translate.lang import data
 
-
 logger = logging.getLogger(__name__)
 
 

diff --git a/translate/lang/data.py b/translate/lang/data.py
@@ -25,7 +25,6 @@
 import re
 import unicodedata
 
-
 try:
     import pycountry
 except ImportError:

diff --git a/translate/lang/factory.py b/translate/lang/factory.py
@@ -24,7 +24,6 @@
 
 from translate.lang import common, data
 
-
 prefix = "code_"
 
 

diff --git a/translate/lang/ngram.py b/translate/lang/ngram.py
@@ -29,7 +29,6 @@
 import sys
 from os import path
 
-
 nb_ngrams = 400
 white_space_re = re.compile(r"\s+")
 

diff --git a/translate/lang/team.py b/translate/lang/team.py
@@ -22,7 +22,6 @@
 
 import re
 
-
 __all__ = ("LANG_TEAM_CONTACT_SNIPPETS", "guess_language")
 
 LANG_TEAM_REGEX = (

diff --git a/translate/lang/test_identify.py b/translate/lang/test_identify.py
@@ -3,7 +3,6 @@
 from translate.lang.identify import LanguageIdentifier
 from translate.storage.base import TranslationUnit
 
-
 TEXT = """
 Ästhetik des "Erhabenen" herangezogen.
 kostete (hinzu kommen über 6 630 tote

diff --git a/translate/misc/ourdom.py b/translate/misc/ourdom.py
@@ -27,7 +27,6 @@
 
 from xml.dom import expatbuilder, minidom
 
-
 # helper functions we use to do xml the way we want, used by modified
 # classes below
 

diff --git a/translate/misc/selector.py b/translate/misc/selector.py
@@ -27,7 +27,6 @@
 from itertools import starmap
 from wsgiref.util import shift_path_info
 
-
 try:
     from resolver import resolve
 except ImportError:

diff --git a/translate/misc/xml_helpers.py b/translate/misc/xml_helpers.py
@@ -23,7 +23,6 @@
 
 from lxml import etree
 
-
 # some useful xpath expressions
 xml_preserve_ancestors = etree.XPath(
     "ancestor-or-self::*[attribute::xml:space='preserve']"

diff --git a/translate/storage/_factory_classes.py b/translate/storage/_factory_classes.py
@@ -37,7 +37,6 @@
     xliff,
 )
 
-
 try:
     from . import trados
 except ImportError: