refine import style

builder/kojid

@@ -60,8 +60,12 @@ import koji.rpmdiff
 import koji.tasks
 import koji.util
 from koji.daemon import SCM, TaskManager, incremental_upload, log_output
-from koji.tasks import (BaseTaskHandler, MultiPlatformTask, ServerExit,
-                        ServerRestart)
+from koji.tasks import (
+    BaseTaskHandler,
+    MultiPlatformTask,
+    ServerExit,
+    ServerRestart
+)
 from koji.util import dslice, dslice_ex, isSuccess, parseStatus, to_list
 
 try:

cli/koji_cli/commands.py

@@ -23,12 +23,27 @@ from six.moves import filter, map, range, zip
 
 import koji
 from koji.util import base64encode, to_list
-from koji_cli.lib import (_, _list_tasks, _progress_callback, _running_in_bg,
-                          activate_session, arg_filter, download_file, error,
-                          format_inheritance_flags, get_usage_str, greetings,
-                          linked_upload, list_task_output_all_volumes,
-                          print_task_headers, print_task_recurse, unique_path,
-                          warn, watch_logs, watch_tasks)
+from koji_cli.lib import (
+    _,
+    _list_tasks,
+    _progress_callback,
+    _running_in_bg,
+    activate_session,
+    arg_filter,
+    download_file,
+    error,
+    format_inheritance_flags,
+    get_usage_str,
+    greetings,
+    linked_upload,
+    list_task_output_all_volumes,
+    print_task_headers,
+    print_task_recurse,
+    unique_path,
+    warn,
+    watch_logs,
+    watch_tasks
+)
 
 try:
     import libcomps

hub/kojihub.py

@@ -60,8 +60,16 @@ import koji.rpmdiff
 import koji.tasks
 import koji.xmlrpcplus
 from koji.context import context
-from koji.util import (base64encode, decode_bytes, dslice, joinpath,
-                       move_and_symlink, multi_fnmatch, safer_move, to_list)
+from koji.util import (
+    base64encode,
+    decode_bytes,
+    dslice,
+    joinpath,
+    move_and_symlink,
+    multi_fnmatch,
+    safer_move,
+    to_list
+)
 
 try:
     # py 3.6+

koji/daemon.py

@@ -40,8 +40,13 @@ import koji
 import koji.tasks
 import koji.xmlrpcplus
 from koji.tasks import safe_rmtree
-from koji.util import (adler32_constructor, base64encode, dslice, parseStatus,
-                       to_list)
+from koji.util import (
+    adler32_constructor,
+    base64encode,
+    dslice,
+    parseStatus,
+    to_list
+)
 
 
 def incremental_upload(session, fname, fd, path, retries=5, logger=None):

plugins/cli/runroot.py

@@ -6,8 +6,13 @@ from optparse import OptionParser
 
 import koji
 from koji.plugin import export_cli
-from koji_cli.lib import (_, activate_session, bytes_to_stdout,
-                          list_task_output_all_volumes, watch_tasks)
+from koji_cli.lib import (
+    _,
+    activate_session,
+    bytes_to_stdout,
+    list_task_output_all_volumes,
+    watch_tasks
+)
 
 
 @export_cli

plugins/cli/sidetag_cli.py

@@ -9,8 +9,8 @@ from argparse import ArgumentParser
 
 import koji
 from koji.plugin import export_cli
-from koji_cli.lib import _, activate_session
 from koji_cli.commands import anon_handle_wait_repo
+from koji_cli.lib import _, activate_session
 
 
 @export_cli

plugins/hub/sidetag_hub.py

@@ -3,27 +3,26 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
 import sys
 
-from koji.context import context
-from koji.plugin import export, callback
 import koji
+from koji.context import context
+from koji.plugin import callback, export
+sys.path.insert(0, "/usr/share/koji-hub/")
+from kojihub import (
+    QueryProcessor,
+    _create_build_target,
+    _create_tag,
+    _delete_build_target,
+    _delete_tag,
+    assert_policy,
+    get_build_target,
+    get_tag,
+    get_user,
+    nextval
+)
 
 CONFIG_FILE = "/etc/koji-hub/plugins/sidetag.conf"
 CONFIG = None
 
-sys.path.insert(0, "/usr/share/koji-hub/")
-from kojihub import (
-    assert_policy,
-    get_tag,
-    get_user,
-    get_build_target,
-    _create_tag,
-    _create_build_target,
-    _delete_tag,
-    _delete_build_target,
-    QueryProcessor,
-    nextval,
-)
-
 
 @export
 def createSideTag(basetag):

vm/kojivmd

@@ -48,8 +48,14 @@ import koji
 import koji.util
 from koji.daemon import SCM, TaskManager
 # TaskHandlers are required to be imported, do not remove them
-from koji.tasks import (BaseTaskHandler, MultiPlatformTask, RestartTask,  # noqa: F401
-                        RestartVerifyTask, ServerExit, ServerRestart)
+from koji.tasks import (  # noqa: F401
+    BaseTaskHandler,
+    MultiPlatformTask,
+    RestartTask,
+    RestartVerifyTask,
+    ServerExit,
+    ServerRestart
+)
 
 try:
     import krbV