From 921258749a2be5686de2cd3d2804c627c51d2b12 Mon Sep 17 00:00:00 2001 From: Tomas Kopecek Date: Tue, 4 Oct 2016 15:17:25 +0200 Subject: [PATCH] removed unused imports --- docs/source/conf.py | 4 ++-- koji/__init__.py | 1 - koji/server.py | 1 - koji/ssl/SSLCommon.py | 1 - koji/ssl/SSLConnection.py | 4 ++-- koji/util.py | 1 + tests/test_hub/test_get_build_type.py | 1 - tests/test_hub/test_list_btypes.py | 1 - tests/test_hub/test_new_typed_build.py | 1 - tests/test_hub/test_recycle_build.py | 1 - tests/test_tasks.py | 4 ++-- vm/kojikamid.py | 1 - www/kojiweb/index.py | 2 -- www/lib/kojiweb/util.py | 1 - 14 files changed, 7 insertions(+), 17 deletions(-) diff --git a/docs/source/conf.py b/docs/source/conf.py index c3945fd8..ba452835 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -12,8 +12,8 @@ # All configuration values have a default; values that are commented out # serve to show the default. -import sys -import os +#import sys +#import os # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the diff --git a/koji/__init__.py b/koji/__init__.py index 2252e4f6..ac108db5 100644 --- a/koji/__init__.py +++ b/koji/__init__.py @@ -65,7 +65,6 @@ import xmlrpclib import xml.sax import xml.sax.handler from xmlrpclib import loads, dumps, Fault -import zipfile PROFILE_MODULES = {} # {module_name: module_instance} diff --git a/koji/server.py b/koji/server.py index 52f13f53..6a650170 100644 --- a/koji/server.py +++ b/koji/server.py @@ -19,7 +19,6 @@ # Authors: # Mike McLean -import koji import sys import traceback from koji.util import LazyDict diff --git a/koji/ssl/SSLCommon.py b/koji/ssl/SSLCommon.py index 345d4ea9..456293b5 100644 --- a/koji/ssl/SSLCommon.py +++ b/koji/ssl/SSLCommon.py @@ -19,7 +19,6 @@ from OpenSSL import SSL import SSLConnection import httplib import socket -import SocketServer def our_verify(connection, x509, errNum, errDepth, preverifyOK): # print "Verify: errNum = %s, errDepth = %s, preverifyOK = %s" % (errNum, errDepth, preverifyOK) diff --git a/koji/ssl/SSLConnection.py b/koji/ssl/SSLConnection.py index de77d0d3..d854770a 100644 --- a/koji/ssl/SSLConnection.py +++ b/koji/ssl/SSLConnection.py @@ -6,8 +6,8 @@ # Modifications by Dan Williams -from OpenSSL import SSL, crypto -import os, string, time, socket, select +from OpenSSL import SSL +import time, socket, select class SSLConnection: diff --git a/koji/util.py b/koji/util.py index 3fe20eb0..7f0cdff4 100644 --- a/koji/util.py +++ b/koji/util.py @@ -33,6 +33,7 @@ import time import ConfigParser from zlib import adler32 +# imported from kojiweb and kojihub try: from hashlib import md5 as md5_constructor except ImportError: diff --git a/tests/test_hub/test_get_build_type.py b/tests/test_hub/test_get_build_type.py index 5dc87af9..00406d4f 100644 --- a/tests/test_hub/test_get_build_type.py +++ b/tests/test_hub/test_get_build_type.py @@ -1,7 +1,6 @@ import unittest import mock -import koji import kojihub diff --git a/tests/test_hub/test_list_btypes.py b/tests/test_hub/test_list_btypes.py index 25a7ab48..b5f4bc55 100644 --- a/tests/test_hub/test_list_btypes.py +++ b/tests/test_hub/test_list_btypes.py @@ -1,7 +1,6 @@ import unittest import mock -import koji import kojihub QP = kojihub.QueryProcessor diff --git a/tests/test_hub/test_new_typed_build.py b/tests/test_hub/test_new_typed_build.py index 9d6516cb..f2287d33 100644 --- a/tests/test_hub/test_new_typed_build.py +++ b/tests/test_hub/test_new_typed_build.py @@ -1,7 +1,6 @@ import unittest import mock -import koji import kojihub diff --git a/tests/test_hub/test_recycle_build.py b/tests/test_hub/test_recycle_build.py index 24d61bb5..2179b044 100644 --- a/tests/test_hub/test_recycle_build.py +++ b/tests/test_hub/test_recycle_build.py @@ -1,4 +1,3 @@ -import unittest import mock import koji diff --git a/tests/test_tasks.py b/tests/test_tasks.py index b54a01e4..c62af250 100644 --- a/tests/test_tasks.py +++ b/tests/test_tasks.py @@ -1,9 +1,9 @@ import random from unittest import TestCase -from mock import patch, mock_open, Mock, call +from mock import patch, Mock, call from tempfile import gettempdir from shutil import rmtree -from os import path, makedirs, stat, getuid, getgid +from os import path, makedirs from io import StringIO import koji diff --git a/vm/kojikamid.py b/vm/kojikamid.py index 15c05700..dd097f9b 100755 --- a/vm/kojikamid.py +++ b/vm/kojikamid.py @@ -33,7 +33,6 @@ import subprocess import sys import tempfile import time -import urlparse import xmlrpclib import base64 import hashlib diff --git a/www/kojiweb/index.py b/www/kojiweb/index.py index 63c6be69..871ac9bb 100644 --- a/www/kojiweb/index.py +++ b/www/kojiweb/index.py @@ -26,8 +26,6 @@ import re import sys import mimetypes import Cookie -import Cheetah.Filters -import Cheetah.Template import datetime import logging import time diff --git a/www/lib/kojiweb/util.py b/www/lib/kojiweb/util.py index 5f065a58..5aa1cb39 100644 --- a/www/lib/kojiweb/util.py +++ b/www/lib/kojiweb/util.py @@ -26,7 +26,6 @@ import koji from koji.util import md5_constructor import os import stat -import time #a bunch of exception classes that explainError needs from socket import error as socket_error from socket import sslerror as socket_sslerror