sort imports in util

util/koji-gc

@@ -7,28 +7,32 @@
 #       Mike McLean <mikem@redhat.com>
 
 from __future__ import absolute_import
-import six
-try:
-    import krbV
-except ImportError:  # pragma: no cover
-    krbV = None
-import koji
-from koji.util import LazyDict, LazyValue, to_list
-import koji.policy
+
 import datetime
 import fnmatch
 import optparse
 import os
 import pprint
 import smtplib
-import socket   # for socket.error
+import socket  # for socket.error
 import sys
 import time
-import six.moves.xmlrpc_client  # for ProtocolError and Fault
-import six.moves.configparser
-from six.moves import email_mime_text as MIMEText
 from string import Template
 
+import six
+import six.moves.configparser
+import six.moves.xmlrpc_client  # for ProtocolError and Fault
+from six.moves import email_mime_text as MIMEText
+
+import koji
+import koji.policy
+from koji.util import LazyDict, LazyValue, to_list
+
+try:
+    import krbV
+except ImportError:  # pragma: no cover
+    krbV = None
+
 
 def _(args):
     """Stub function for translation"""

util/koji-shadow

@@ -23,26 +23,30 @@
 #       Karsten Hopp <karsten@redhat.com>
 
 from __future__ import absolute_import
-from six.moves import range
-import six
-try:
-    import krbV
-except ImportError:  # pragma: no cover
-    krbV = None
-import koji
-from koji.util import to_list
+
 import fnmatch
 import optparse
 import os
 import random
 import shutil
-import socket   # for socket.error and socket.setdefaulttimeout
+import socket  # for socket.error and socket.setdefaulttimeout
 import string
 import sys
 import time
 import urllib2
-import six.moves.xmlrpc_client  # for ProtocolError and Fault
+
 import rpm
+import six
+import six.moves.xmlrpc_client  # for ProtocolError and Fault
+from six.moves import range
+
+import koji
+from koji.util import to_list
+
+try:
+    import krbV
+except ImportError:  # pragma: no cover
+    krbV = None
 
 # koji.fp.o keeps stalling, probably network errors...
 # better to time out than to stall

util/koji-sweep-db

@@ -1,12 +1,13 @@
 #!/usr/bin/python2
 
 import os
-
 from optparse import OptionParser
+
 from six.moves.configparser import RawConfigParser
 
 import koji.db
 
+
 def clean_sessions(cursor, vacuum):
     q = " FROM sessions WHERE update_time < now() - '1 day'::interval"
     if options.verbose:

util/kojira

@@ -20,26 +20,26 @@
 # Authors:
 #       Mike McLean <mikem@redhat.com>
 
-from __future__ import absolute_import
-from __future__ import division
-import sys
-import os
-import koji
-from koji.util import rmtree, parseStatus, to_list
-from optparse import OptionParser
+from __future__ import absolute_import, division
+
 import errno
 import json
 import logging
 import logging.handlers
+import os
 import pprint
 import signal
 import stat
-import time
+import sys
 import threading
+import time
 import traceback
+from optparse import OptionParser
+
 import six
 
-
+import koji
+from koji.util import parseStatus, rmtree, to_list
 
 tag_cache = {}