Sort imports

ksconf/__init__.py

@@ -12,16 +12,17 @@
 
 """
 
-from __future__ import absolute_import
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
 
 __author__ = "Lowell Alleman <lowell@kintyre.co>"
 __copyright__ = "(c) 2019 Kintyre Solutions, Inc"
 __license__ = "Apache Public License v2"
 
 # _version.py is autogenerated at build time.  But is missing on first call to setup.py
 try:
-    from ._version import version as __version__, build as __build__, vcs_info as __vcs_info__
+    from ._version import build as __build__
+    from ._version import vcs_info as __vcs_info__
+    from ._version import version as __version__
 except ImportError:     # pragma: no cover
     __version__ = None
     __build__ = None

ksconf/__main__.py

@@ -12,22 +12,21 @@
 
 """
 
-from __future__ import absolute_import
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
 
 import argparse
-import sys
 import os
 import platform
-
+import sys
 from collections import defaultdict
 
 import ksconf
 import ksconf.util
-from ksconf.commands import DescriptionHelpFormatterPreserveLayout, get_all_ksconf_cmds
+from ksconf.commands import (DescriptionHelpFormatterPreserveLayout,
+                             get_all_ksconf_cmds)
+from ksconf.consts import (EXIT_CODE_ENV_BUSTED, EXIT_CODE_INTERNAL_ERROR,
+                           KSCONF_DEBUG)
 from ksconf.util.completers import autocomplete
-from ksconf.consts import EXIT_CODE_INTERNAL_ERROR, EXIT_CODE_ENV_BUSTED, KSCONF_DEBUG
-
 
 # Workaround PY2:  WindowsError: [Error -2146893795] Provider DLL failed to initialize correctly
 # Someday need to re-evaluate this and see if it's reproducible on other machines....

ksconf/archive.py

@@ -1,5 +1,4 @@
-from __future__ import absolute_import
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
 
 import os
 from collections import namedtuple

ksconf/builder/core.py

@@ -34,7 +34,7 @@
 from ksconf.ext.six import text_type
 
 try:
-    from typing import Callable, List, Any
+    from typing import Any, Callable, List
 except ImportError:
     Callable = List = Any = type
 

ksconf/builder/steps.py

@@ -2,14 +2,11 @@
 """
 from __future__ import absolute_import, unicode_literals
 
-
 import re
 import sys
-
-from ksconf.builder import BuildStep
-from ksconf.builder import VERBOSE, QUIET
 from shutil import copy2, rmtree
 
+from ksconf.builder import QUIET, VERBOSE, BuildStep
 
 if sys.version_info < (3, 6):
     # Allow these stdlib functions to work with pathlib

ksconf/commands/check.py

@@ -13,8 +13,10 @@
 from collections import Counter
 
 from ksconf.commands import KsconfCmd, dedent
-from ksconf.conf.parser import parse_conf, PARSECONF_STRICT_NC, ConfParserException
-from ksconf.consts import EXIT_CODE_SUCCESS, EXIT_CODE_BAD_CONF_FILE, EXIT_CODE_INTERNAL_ERROR
+from ksconf.conf.parser import (PARSECONF_STRICT_NC, ConfParserException,
+                                parse_conf)
+from ksconf.consts import (EXIT_CODE_BAD_CONF_FILE, EXIT_CODE_INTERNAL_ERROR,
+                           EXIT_CODE_SUCCESS)
 from ksconf.util import debug_traceback
 from ksconf.util.completers import conf_files_completer
 from ksconf.util.file import _stdin_iter, expand_glob_list

ksconf/commands/combine.py

@@ -14,17 +14,20 @@
 import os
 import re
 
-from ksconf.layer import DirectLayerRoot, DotDLayerRoot, LayerConfig, LayerFilter
-from ksconf.commands import ConfFileProxy
-from ksconf.commands import KsconfCmd, dedent
+from ksconf.commands import ConfFileProxy, KsconfCmd, dedent
 from ksconf.conf.delta import show_text_diff
 from ksconf.conf.merge import merge_conf_files
 from ksconf.conf.parser import PARSECONF_MID, PARSECONF_STRICT
-from ksconf.consts import EXIT_CODE_MISSING_ARG, EXIT_CODE_COMBINE_MARKER_MISSING, SMART_NOCHANGE, \
-    EXIT_CODE_NO_SUCH_FILE, EXIT_CODE_BAD_ARGS
+from ksconf.consts import (EXIT_CODE_BAD_ARGS,
+                           EXIT_CODE_COMBINE_MARKER_MISSING,
+                           EXIT_CODE_MISSING_ARG, EXIT_CODE_NO_SUCH_FILE,
+                           SMART_NOCHANGE)
+from ksconf.layer import (DirectLayerRoot, DotDLayerRoot, LayerConfig,
+                          LayerFilter)
 from ksconf.util.compare import file_compare
 from ksconf.util.completers import DirectoriesCompleter
-from ksconf.util.file import expand_glob_list, relwalk, _is_binary_file, smart_copy
+from ksconf.util.file import (_is_binary_file, expand_glob_list, relwalk,
+                              smart_copy)
 
 CONTROLLED_DIR_MARKER = ".ksconf_controlled"
 

ksconf/commands/diff.py

@@ -11,7 +11,7 @@
 
 import argparse
 
-from ksconf.commands import KsconfCmd, dedent, ConfFileType
+from ksconf.commands import ConfFileType, KsconfCmd, dedent
 from ksconf.conf.delta import compare_cfgs, show_diff
 from ksconf.conf.parser import PARSECONF_MID_NC
 from ksconf.consts import EXIT_CODE_DIFF_EQUAL, EXIT_CODE_DIFF_NO_COMMON

ksconf/commands/filter.py

@@ -20,10 +20,11 @@
 import argparse
 import sys
 
-from ksconf.commands import KsconfCmd, dedent, ConfFileType
+from ksconf.commands import ConfFileType, KsconfCmd, dedent
 from ksconf.conf.parser import PARSECONF_MID_NC, write_conf_stream
 from ksconf.consts import EXIT_CODE_SUCCESS
-from ksconf.filter import FilteredList, FilterListWildcard, create_filtered_list
+from ksconf.filter import (FilteredList, FilterListWildcard,
+                           create_filtered_list)
 from ksconf.util.completers import conf_files_completer
 
 

ksconf/commands/merge.py

@@ -12,9 +12,9 @@
 
 import os
 
-from ksconf.commands import KsconfCmd, dedent, ConfFileProxy, ConfFileType
+from ksconf.commands import ConfFileProxy, ConfFileType, KsconfCmd, dedent
 from ksconf.conf.merge import merge_conf_files
-from ksconf.conf.parser import PARSECONF_STRICT, PARSECONF_MID
+from ksconf.conf.parser import PARSECONF_MID, PARSECONF_STRICT
 from ksconf.consts import EXIT_CODE_SUCCESS
 from ksconf.util.completers import conf_files_completer
 

ksconf/commands/minimize.py

@@ -18,13 +18,14 @@
 
 import ksconf.ext.six as six
 
-from ksconf.commands import KsconfCmd, dedent, ConfFileType
-from ksconf.conf.delta import compare_cfgs, DIFF_OP_DELETE, DIFF_OP_EQUAL, DiffStanza, \
-    DIFF_OP_INSERT, DIFF_OP_REPLACE, show_diff
-from ksconf.consts import EXIT_CODE_MISSING_ARG
+from ksconf.commands import ConfFileType, KsconfCmd, dedent
+from ksconf.conf.delta import (DIFF_OP_DELETE, DIFF_OP_EQUAL, DIFF_OP_INSERT,
+                               DIFF_OP_REPLACE, DiffStanza, compare_cfgs,
+                               show_diff)
 from ksconf.conf.merge import merge_conf_dicts
-from ksconf.conf.parser import GLOBAL_STANZA, _drop_stanza_comments
-from ksconf.conf.parser import PARSECONF_STRICT, PARSECONF_LOOSE
+from ksconf.conf.parser import (GLOBAL_STANZA, PARSECONF_LOOSE,
+                                PARSECONF_STRICT, _drop_stanza_comments)
+from ksconf.consts import EXIT_CODE_MISSING_ARG
 from ksconf.util.completers import conf_files_completer
 from ksconf.util.file import match_bwlist
 

ksconf/commands/package.py

@@ -24,7 +24,7 @@
 import os
 
 from ksconf.commands import KsconfCmd, dedent
-from ksconf.consts import EXIT_CODE_SUCCESS, EXIT_CODE_BAD_ARGS
+from ksconf.consts import EXIT_CODE_BAD_ARGS, EXIT_CODE_SUCCESS
 from ksconf.package import AppPackager
 
 

ksconf/commands/promote.py

@@ -15,17 +15,17 @@
 import shutil
 from copy import deepcopy
 
+from ksconf.commands import ConfDirProxy, ConfFileType, KsconfCmd, dedent
+from ksconf.conf.delta import (DIFF_OP_DELETE, DIFF_OP_EQUAL, DIFF_OP_INSERT,
+                               DIFF_OP_REPLACE, DiffStanza, DiffStzKey,
+                               compare_cfgs, show_diff, summarize_cfg_diffs)
+from ksconf.conf.merge import merge_conf_dicts
+from ksconf.conf.parser import PARSECONF_STRICT, PARSECONF_STRICT_NC
+from ksconf.consts import (EXIT_CODE_EXTERNAL_FILE_EDIT,
+                           EXIT_CODE_FAILED_SAFETY_CHECK,
+                           EXIT_CODE_NOTHING_TO_DO, EXIT_CODE_USER_QUIT)
 from ksconf.ext.six.moves import input
-
-from ksconf.commands import ConfDirProxy
-from ksconf.commands import KsconfCmd, dedent, ConfFileType
 from ksconf.filter import FilteredList, create_filtered_list
-from ksconf.conf.delta import compare_cfgs, DIFF_OP_DELETE, summarize_cfg_diffs, show_diff, \
-    DIFF_OP_EQUAL, DiffStanza, DiffStzKey, DIFF_OP_INSERT, DIFF_OP_REPLACE
-from ksconf.conf.merge import merge_conf_dicts
-from ksconf.conf.parser import PARSECONF_STRICT_NC, PARSECONF_STRICT
-from ksconf.consts import EXIT_CODE_FAILED_SAFETY_CHECK, EXIT_CODE_NOTHING_TO_DO, \
-    EXIT_CODE_USER_QUIT, EXIT_CODE_EXTERNAL_FILE_EDIT
 from ksconf.util.completers import conf_files_completer
 from ksconf.util.file import _samefile, file_fingerprint
 

ksconf/commands/restexport.py

@@ -23,13 +23,12 @@
 from argparse import ArgumentParser, FileType
 from collections import OrderedDict
 
-from ksconf.ext.six.moves.urllib.parse import quote
-
-from ksconf.util.rest import build_rest_url
-from ksconf.commands import KsconfCmd, dedent, ConfFileType
-from ksconf.conf.parser import PARSECONF_LOOSE, GLOBAL_STANZA
+from ksconf.commands import ConfFileType, KsconfCmd, dedent
+from ksconf.conf.parser import GLOBAL_STANZA, PARSECONF_LOOSE
 from ksconf.consts import EXIT_CODE_SUCCESS
+from ksconf.ext.six.moves.urllib.parse import quote
 from ksconf.util.completers import conf_files_completer
+from ksconf.util.rest import build_rest_url
 
 
 class Literal(object):

ksconf/commands/restpublish.py

@@ -17,17 +17,19 @@
 from argparse import ArgumentParser
 
 import ksconf.ext.six as six
-
 from ksconf.ext.six.moves.urllib.parse import urlparse
 
-from ksconf.commands import KsconfCmd, dedent, ConfFileType, ConfFileProxy, \
-    add_splunkd_access_args, add_splunkd_namespace
-from ksconf.conf.parser import PARSECONF_LOOSE, GLOBAL_STANZA, conf_attr_boolean
-from ksconf.conf.delta import compare_stanzas, show_diff, DiffHeader, reduce_stanza, is_equal
+from ksconf.commands import (ConfFileProxy, ConfFileType, KsconfCmd,
+                             add_splunkd_access_args, add_splunkd_namespace,
+                             dedent)
+from ksconf.conf.delta import (DiffHeader, compare_stanzas, is_equal,
+                               reduce_stanza, show_diff)
 from ksconf.conf.meta import MetaData
+from ksconf.conf.parser import (GLOBAL_STANZA, PARSECONF_LOOSE,
+                                conf_attr_boolean)
 from ksconf.consts import EXIT_CODE_SUCCESS
-from ksconf.util.completers import conf_files_completer
 
+from ksconf.util.completers import conf_files_completer
 
 # Lazy loaded by _handle_imports()
 splunklib = None

ksconf/commands/snapshot.py

@@ -10,18 +10,18 @@
 """
 from __future__ import absolute_import, unicode_literals
 
-import sys
-import os
 import json
-
+import os
+import sys
 from argparse import FileType
 
-from ksconf import __version__, __vcs_info__
+from ksconf import __vcs_info__, __version__
 from ksconf.commands import KsconfCmd, dedent
-from ksconf.conf.parser import PARSECONF_MID_NC, parse_conf, ConfParserException, GLOBAL_STANZA
-from ksconf.consts import EXIT_CODE_SUCCESS, EXIT_CODE_NO_SUCH_FILE
-from ksconf.util.file import file_hash
+from ksconf.conf.parser import (GLOBAL_STANZA, PARSECONF_MID_NC,
+                                ConfParserException, parse_conf)
+from ksconf.consts import EXIT_CODE_NO_SUCH_FILE, EXIT_CODE_SUCCESS
 from ksconf.util.completers import DirectoriesCompleter, FilesCompleter
+from ksconf.util.file import file_hash
 
 
 class ConfSnapshotConfig(object):

ksconf/commands/sort.py

@@ -10,9 +10,10 @@
 from __future__ import absolute_import, unicode_literals
 
 from ksconf.commands import KsconfCmd, dedent
-from ksconf.conf.parser import PARSECONF_STRICT, write_conf, ConfParserException
-from ksconf.consts import SMART_NOCHANGE, EXIT_CODE_BAD_CONF_FILE, EXIT_CODE_SORT_APPLIED, \
-    EXIT_CODE_SUCCESS
+from ksconf.conf.parser import (PARSECONF_STRICT, ConfParserException,
+                                write_conf)
+from ksconf.consts import (EXIT_CODE_BAD_CONF_FILE, EXIT_CODE_SORT_APPLIED,
+                           EXIT_CODE_SUCCESS, SMART_NOCHANGE)
 from ksconf.util.completers import conf_files_completer
 from ksconf.util.file import expand_glob_list
 

ksconf/commands/unarchive.py

@@ -15,16 +15,19 @@
 from io import StringIO
 from subprocess import list2cmdline
 
-from ksconf.archive import extract_archive, gaf_filter_name_like, sanity_checker, \
-    gen_arch_file_remapper
+from ksconf.archive import (extract_archive, gaf_filter_name_like,
+                            gen_arch_file_remapper, sanity_checker)
 from ksconf.commands import KsconfCmd, dedent
-from ksconf.conf.parser import parse_conf, PARSECONF_LOOSE, ConfParserException, default_encoding
-from ksconf.consts import EXIT_CODE_FAILED_SAFETY_CHECK, EXIT_CODE_GIT_FAILURE, KSCONF_DEBUG
+from ksconf.conf.parser import (PARSECONF_LOOSE, ConfParserException,
+                                default_encoding, parse_conf)
+from ksconf.consts import (EXIT_CODE_FAILED_SAFETY_CHECK,
+                           EXIT_CODE_GIT_FAILURE, KSCONF_DEBUG)
 from ksconf.util.compare import _cmp_sets
 from ksconf.util.completers import DirectoriesCompleter, FilesCompleter
-from ksconf.util.file import file_hash, match_bwlist, dir_exists, relwalk
-from ksconf.vc.git import git_is_working_tree, git_ls_files, git_is_clean, git_status_ui, \
-    git_cmd_iterable, git_cmd, git_version
+from ksconf.util.file import dir_exists, file_hash, match_bwlist, relwalk
+from ksconf.vc.git import (git_cmd, git_cmd_iterable, git_is_clean,
+                           git_is_working_tree, git_ls_files, git_status_ui,
+                           git_version)
 
 allowed_extentions = ("*.tgz", "*.tar.gz", "*.spl", "*.zip")
 

ksconf/commands/xmlformat.py

@@ -13,16 +13,14 @@
 from collections import Counter
 
 from ksconf.commands import KsconfCmd, dedent
-from ksconf.consts import EXIT_CODE_SUCCESS, EXIT_CODE_FORMAT_APPLIED, EXIT_CODE_BAD_CONF_FILE,\
-    EXIT_CODE_INTERNAL_ERROR
+from ksconf.consts import (EXIT_CODE_BAD_CONF_FILE, EXIT_CODE_FORMAT_APPLIED,
+                           EXIT_CODE_INTERNAL_ERROR, EXIT_CODE_SUCCESS)
 from ksconf.util import debug_traceback
 from ksconf.util.completers import conf_files_completer
 from ksconf.util.file import _stdin_iter
-
 # Main codebase is here:
 from ksconf.xmlformat import SplunkSimpleXmlFormatter
 
-
 # Lazy loaded by _handle_imports()
 etree = None
 

ksconf/conf/delta.py

@@ -3,15 +3,16 @@
 import datetime
 import difflib
 import os
-from collections import namedtuple, defaultdict, Counter
+from collections import Counter, defaultdict, namedtuple
 from io import open
 
 import ksconf.ext.six as six
-
 from ksconf.conf.parser import GLOBAL_STANZA, _format_stanza, default_encoding
-from ksconf.consts import EXIT_CODE_DIFF_EQUAL, EXIT_CODE_DIFF_CHANGE, EXIT_CODE_DIFF_NO_COMMON
+from ksconf.consts import (EXIT_CODE_DIFF_CHANGE, EXIT_CODE_DIFF_EQUAL,
+                           EXIT_CODE_DIFF_NO_COMMON)
 from ksconf.util.compare import _cmp_sets
-from ksconf.util.terminal import TermColor, ANSI_RESET, ANSI_GREEN, ANSI_RED, ANSI_YELLOW, ANSI_BOLD
+from ksconf.util.terminal import (ANSI_BOLD, ANSI_GREEN, ANSI_RED, ANSI_RESET,
+                                  ANSI_YELLOW, TermColor)
 
 ####################################################################################################
 # Diff logic

ksconf/conf/merge.py

@@ -1,5 +1,4 @@
-from __future__ import absolute_import
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
 
 import os
 import shutil
@@ -9,8 +8,9 @@
 import ksconf.ext.six as six
 from ksconf.commands import ConfFileProxy
 from ksconf.conf.delta import compare_cfgs, show_diff
-from ksconf.conf.parser import GLOBAL_STANZA, _extract_comments, inject_section_comments, \
-    parse_conf, write_conf
+from ksconf.conf.parser import (GLOBAL_STANZA, _extract_comments,
+                                inject_section_comments, parse_conf,
+                                write_conf)
 from ksconf.consts import SMART_UPDATE
 from ksconf.util.file import relwalk
 

ksconf/conf/parser.py

@@ -18,11 +18,11 @@
 import codecs
 import os
 import re
-from io import open, StringIO
+from io import StringIO, open
 
 import ksconf.ext.six as six
 
-from ..consts import SMART_NOCHANGE, SMART_UPDATE, SMART_CREATE
+from ..consts import SMART_CREATE, SMART_NOCHANGE, SMART_UPDATE
 from ..util.compare import fileobj_compare
 
 default_encoding = "utf-8"