sort imports in koji

koji/__init__.py

@@ -22,32 +22,56 @@
 #       Mike Bonnet <mikeb@redhat.com>
 
 
-from __future__ import absolute_import
-from __future__ import division
+from __future__ import absolute_import, division
+
+import base64
+import datetime
+import errno
+import hashlib
+import imp
+import logging
+import logging.handlers
+import optparse
+import os
+import os.path
+import pwd
+import random
+import re
+import shutil
+import signal
+import socket
+import struct
 import sys
-from six.moves import range
-from six.moves import zip
+import tempfile
+import time
+import traceback
+import warnings
+import weakref
+import xml.sax
+import xml.sax.handler
+from fnmatch import fnmatch
+
+import requests
 import six
+import six.moves.configparser
+import six.moves.http_client
+import six.moves.urllib
+from six.moves import range, zip
+
+from koji.xmlrpcplus import Fault, dumps, getparser, loads, xmlrpc_client
+
+from . import util
+
 krbV = None
 try:
     import krbV
 except ImportError:  # pragma: no cover
     pass
-import base64
-import datetime
 dns_resolver = None
 try:
     import dns.resolver as dns_resolver
 except ImportError:  # pragma: no cover
     pass
-import six.moves.configparser
-import errno
-from fnmatch import fnmatch
-import hashlib
-import six.moves.http_client
-import imp
-import logging
-import logging.handlers
 SSL_Error = None
 try:
     from OpenSSL.SSL import Error as SSL_Error
@@ -57,13 +81,6 @@ except Exception:  # pragma: no cover
     # unfortunately the workaround at the above link does not always work, so
     # we ignore it here
     pass
-import optparse
-import os
-import os.path
-import pwd
-import random
-import re
-import requests
 try:
     import requests_kerberos
 except ImportError:  # pragma: no cover
@@ -72,20 +89,6 @@ try:
     import rpm
 except ImportError:
     rpm = None
-import shutil
-import signal
-import socket
-import struct
-import tempfile
-import time
-import traceback
-import warnings
-import weakref
-import xml.sax
-import xml.sax.handler
-import six.moves.urllib
-from . import util
-from koji.xmlrpcplus import getparser, loads, dumps, Fault, xmlrpc_client
 
 
 PROFILE_MODULES = {}  # {module_name: module_instance}

koji/arch.py

@@ -1,11 +1,12 @@
 # This code is from the rpmUtils.arch module of yum
 # yum is licensed as GPLv2+
 
-import os
-import rpm
 import ctypes
+import os
 import struct
 
+import rpm
+
 _ppc64_native_is_best = True
 
 # dict mapping arch -> ( multicompat, best personality, biarch personality )

koji/auth.py

@@ -20,22 +20,25 @@
 #       Mike Bonnet <mikeb@redhat.com>
 
 from __future__ import absolute_import
-import socket
-import string
+
+import base64
 import random
 import re
-import base64
+import socket
+import string
+
+import six
+from six.moves import range, urllib, zip
+
+import koji
+
+from .context import context
+from .util import to_list
+
 try:
     import krbV
 except ImportError:
     krbV = None
-import koji
-from .context import context
-from six.moves import range
-from six.moves import urllib
-from six.moves import zip
-import six
-from .util import to_list
 
 # 1 - load session if provided
 #       - check uri for session id

koji/context.py

@@ -24,8 +24,10 @@
 #    - auth data
 
 from __future__ import absolute_import
-import six.moves._thread
+
 import six
+import six.moves._thread
+
 
 class _data(object):
     pass

koji/daemon.py

@@ -20,27 +20,28 @@
 #       Mike McLean <mikem@redhat.com>
 #       Mike Bonnet <mikeb@redhat.com>
 
-from __future__ import absolute_import
-from __future__ import division
+from __future__ import absolute_import, division
+
+import errno
+import hashlib
+import logging
+import os
+import signal
+import subprocess
+import sys
+import time
+import traceback
+from fnmatch import fnmatch
+
+import six
+from six.moves import range, urllib
+
 import koji
 import koji.tasks
 import koji.xmlrpcplus
 from koji.tasks import safe_rmtree
-from koji.util import adler32_constructor, parseStatus, \
-                      dslice, to_list, base64encode
-import hashlib
-import os
-import signal
-import logging
-from fnmatch import fnmatch
-import time
-import subprocess
-import sys
-import traceback
-import errno
-from six.moves import range
-from six.moves import urllib
-import six
+from koji.util import (adler32_constructor, base64encode, dslice, parseStatus,
+                       to_list)
 
 
 def incremental_upload(session, fname, fd, path, retries=5, logger=None):

koji/db.py

@@ -22,8 +22,8 @@
 
 
 from __future__ import absolute_import
+
 import logging
-import psycopg2
 # import psycopg2.extensions
 # # don't convert timestamp fields to DateTime objects
 # del psycopg2.extensions.string_types[1114]
@@ -35,6 +35,9 @@ import re
 import sys
 import time
 import traceback
+
+import psycopg2
+
 from . import context
 
 POSITIONAL_RE = re.compile(r'%[a-z]')

koji/plugin.py

@@ -20,12 +20,15 @@
 #       Mike Bonnet <mikeb@redhat.com>
 
 from __future__ import absolute_import
+
 import imp
-import koji
 import logging
 import sys
 import traceback
+
 import six
+
+import koji
 from koji.util import encode_datetime_recurse
 
 # the available callback hooks and a list

koji/policy.py

@@ -18,12 +18,13 @@
 #       Mike McLean <mikem@redhat.com>
 
 from __future__ import absolute_import
+
 import fnmatch
 import logging
 
-import koji
 import six
 
+import koji
 from koji.util import to_list
 
 

koji/rpmdiff.py

@@ -19,14 +19,17 @@
 # It was modified to be used as standalone library for the Koji project.
 
 from __future__ import absolute_import
+
 import hashlib
-import json
-import rpm
-import os
 import itertools
+import json
+import os
+
+import rpm
 import six
 from six.moves import zip
 
+
 class BytesJSONEncoder(json.JSONEncoder):
     def default(self, o):
         if six.PY3 and isinstance(o, bytes):

koji/util.py

@@ -18,15 +18,12 @@
 #       Mike McLean <mikem@redhat.com>
 #       Mike Bonnet <mikeb@redhat.com>
 
-from __future__ import absolute_import
-from __future__ import division
+from __future__ import absolute_import, division
+
 import base64
 import calendar
 import datetime
 import hashlib
-from koji.xmlrpcplus import DateTime
-from fnmatch import fnmatch
-import koji
 import logging
 import os
 import os.path
@@ -37,11 +34,16 @@ import stat
 import struct
 import sys
 import time
-from zlib import adler32
-from six.moves import range
-import six
 import warnings
-from six.moves import zip
+from fnmatch import fnmatch
+from zlib import adler32
+
+import six
+from six.moves import range, zip
+
+import koji
+from koji.xmlrpcplus import DateTime
+
 
 # imported from kojiweb and kojihub
 def md5_constructor(*args, **kwargs):

koji/xmlrpcplus.py

@@ -3,10 +3,11 @@ Custom xmlrpc handling for Koji
 """
 
 from __future__ import absolute_import
-import six
-import six.moves.xmlrpc_client as xmlrpc_client
+
 import types
 
+import six
+import six.moves.xmlrpc_client as xmlrpc_client
 
 # duplicate a few values that we need
 getparser = xmlrpc_client.getparser