From b8653736ddd3ffe620de69451c018e6d463d52ec Mon Sep 17 00:00:00 2001 From: Yu Ming Zhu Date: Dec 12 2019 11:00:56 +0000 Subject: sort imports in www --- diff --git a/www/kojiweb/index.py b/www/kojiweb/index.py index b5ecd78..09aba88 100644 --- a/www/kojiweb/index.py +++ b/www/kojiweb/index.py @@ -20,27 +20,27 @@ # Mike Bonnet # Mike McLean -from __future__ import absolute_import -from __future__ import division +from __future__ import absolute_import, division + +import datetime import hashlib +import logging +import mimetypes import os import os.path import re import sys -import mimetypes -import six.moves.http_cookies -import datetime -import logging import time + +import six +import six.moves.http_cookies +from six.moves import range + import koji import kojiweb.util -from koji.util import to_list from koji.server import ServerRedirect -from kojiweb.util import _initValues -from kojiweb.util import _genHTML -from kojiweb.util import _getValidTokens -from six.moves import range -import six +from koji.util import to_list +from kojiweb.util import _genHTML, _getValidTokens, _initValues # Convenience definition of a commonly-used sort function _sortbyname = lambda x: x['name'] diff --git a/www/kojiweb/wsgi_publisher.py b/www/kojiweb/wsgi_publisher.py index c3afd32..7f15a55 100644 --- a/www/kojiweb/wsgi_publisher.py +++ b/www/kojiweb/wsgi_publisher.py @@ -20,19 +20,21 @@ # Mike McLean from __future__ import absolute_import + import cgi import inspect -import koji -import koji.util import logging import os.path import pprint import sys import traceback +import six + +import koji +import koji.util from koji.server import ServerError, ServerRedirect from koji.util import dslice, to_list -import six class URLNotFound(ServerError): diff --git a/www/lib/kojiweb/util.py b/www/lib/kojiweb/util.py index a7bdc09..4946261 100644 --- a/www/lib/kojiweb/util.py +++ b/www/lib/kojiweb/util.py @@ -19,25 +19,26 @@ # Authors: # Mike Bonnet # Mike McLean -from __future__ import absolute_import -from __future__ import division +from __future__ import absolute_import, division + import cgi -import Cheetah.Template import datetime import hashlib -import koji import os -import six import ssl import stat import time - -from six.moves import range #a bunch of exception classes that explainError needs from socket import error as socket_error -from six.moves.xmlrpc_client import ProtocolError from xml.parsers.expat import ExpatError +import Cheetah.Template +import six +from six.moves import range +from six.moves.xmlrpc_client import ProtocolError + +import koji + class NoSuchException(Exception): pass