sort imports in cli

cli/koji

@@ -24,26 +24,23 @@
 #       Mike Bonnet <mikeb@redhat.com>
 #       Cristian Balint <cbalint@redhat.com>
 
-from __future__ import absolute_import
+from __future__ import absolute_import, division
-from __future__ import division
+
 import logging
 import os
 import re
-import six
 import sys
+from optparse import SUPPRESS_HELP, OptionParser
 
-from optparse import OptionParser, SUPPRESS_HELP
+import six
-
 import six.moves.configparser
 import six.moves.xmlrpc_client
 
 import koji
-import koji.util
 import koji.plugin
-
+import koji.util
-from koji_cli.lib import _, get_epilog_str, greetings, \
-        warn, categories
 from koji_cli.commands import *
+from koji_cli.lib import _, categories, get_epilog_str, greetings, warn
 
 
 def register_plugin(plugin):

cli/koji_cli/commands.py

@@ -1,8 +1,6 @@
-from __future__ import absolute_import
+from __future__ import absolute_import, division
-from __future__ import division
 
 import ast
-from collections import defaultdict, OrderedDict
 import fnmatch
 import hashlib
 import json
@@ -15,15 +13,22 @@ import stat
 import sys
 import time
 import traceback
-from optparse import OptionParser, SUPPRESS_HELP
+from collections import OrderedDict, defaultdict
+from optparse import SUPPRESS_HELP, OptionParser
 
 import dateutil.parser
 import six
 import six.moves.xmlrpc_client
-from six.moves import filter
+from six.moves import filter, map, range, zip
-from six.moves import map
+
-from six.moves import zip
+import koji
-from six.moves import range
+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, greetings, linked_upload,
+                          list_task_output_all_volumes, parse_arches,
+                          print_task_headers, print_task_recurse, unique_path,
+                          warn, watch_logs, watch_tasks)
 
 try:
     import libcomps
@@ -34,15 +39,6 @@ except ImportError:  # pragma: no cover
     except ImportError:
         yumcomps = None
 
-import koji
-from koji.util import to_list, base64encode
-from koji_cli.lib import _, activate_session, parse_arches, \
-        _running_in_bg, _progress_callback, watch_tasks, \
-        arg_filter, linked_upload, list_task_output_all_volumes, \
-        print_task_headers, print_task_recurse, download_file, watch_logs, \
-        error, warn, greetings, _list_tasks, unique_path, \
-        format_inheritance_flags, get_usage_str
-
 
 def _printable_unicode(s):
     if six.PY2:

cli/koji_cli/lib.py

@@ -1,27 +1,29 @@
 # coding=utf-8
-from __future__ import absolute_import
+from __future__ import absolute_import, division
-from __future__ import division
+
 import optparse
 import os
 import random
-import requests
-import six
 import socket
 import string
 import sys
 import time
 from contextlib import closing
+
+import requests
+import six
 from six.moves import range
 
+import koji
+# import parse_arches to current namespace for backward compatibility
+from koji import parse_arches
+from koji.util import to_list
+
 try:
     import krbV
 except ImportError:  # pragma: no cover
     krbV = None
 
-import koji
-from koji.util import to_list
-# import parse_arches to current namespace for backward compatibility
-from koji import parse_arches
 
 # for compatibility with plugins based on older version of lib
 # Use optparse imports directly in new code.