sort imports in vm

vm/kojikamid.py

@@ -27,26 +27,28 @@
 # in a cygwin shell.
 
 from __future__ import absolute_import
-from optparse import OptionParser
-from six.moves.configparser import ConfigParser, SafeConfigParser
+
+import base64
+import glob
+import hashlib
+import logging
 import os
+import re
 import subprocess
 import sys
 import tempfile
+import threading
 import time
+import traceback
+import zipfile
+from optparse import OptionParser
+
+import six
+import six.moves.xmlrpc_client
 # urllib is required by the SCM class which is substituted into this file
 # do not remove the import below
 from six.moves import urllib
-import six.moves.xmlrpc_client
-import base64
-import hashlib
-import logging
-import traceback
-import threading
-import re
-import glob
-import zipfile
-import six
+from six.moves.configparser import ConfigParser, SafeConfigParser
 
 MANAGER_PORT = 7000
 

vm/kojivmd

@@ -20,34 +20,37 @@
 # Authors:
 #       Mike Bonnet <mikeb@redhat.com>
 
-from __future__ import absolute_import
-from __future__ import division
+from __future__ import absolute_import, division
+
+import base64
+import fnmatch
+import hashlib
+import logging
+import os
+import pwd
+import random
+import signal
+import socket
+import subprocess
+import sys
+import threading
+import time
+from contextlib import closing
+from optparse import OptionParser
+
+import libvirt
+import libxml2
+import requests
+import rpm
+import six.moves.xmlrpc_client
+import six.moves.xmlrpc_server
+
 import koji
 import koji.util
 from koji.daemon import SCM, TaskManager
-from koji.tasks import ServerExit, ServerRestart, BaseTaskHandler, MultiPlatformTask
-from koji.tasks import RestartTask, RestartVerifyTask
-import hashlib
-import sys
-import logging
-import os
-import six.moves.xmlrpc_client
-import signal
-import time
-import subprocess
-import libvirt
-import libxml2
-import random
-import rpm
-import socket
-import six.moves.xmlrpc_server
-import threading
-import base64
-import pwd
-import requests
-import fnmatch
-from contextlib import closing
-from optparse import OptionParser
+from koji.tasks import (BaseTaskHandler, MultiPlatformTask, RestartTask,
+                        RestartVerifyTask, ServerExit, ServerRestart)
+
 try:
     import krbV
 except ImportError:  # pragma: no cover