backend/server/importlib/importLib.py | 2 --
backend/server/importlib/kickstartImport.py | 4 ++--
backend/server/importlib/packageImport.py | 3 +--
backend/server/importlib/test/test_solaris.py | 2 --
backend/server/importlib/userAuth.py | 2 +-
backend/server/rhnChannel.py | 1 -
backend/server/rhnImport.py | 1 -
backend/server/rhnLib.py | 1 -
backend/server/rhnPackageUpload.py | 3 +--
backend/server/rhnRepository.py | 2 --
backend/server/rhnSQL/dbi.py | 2 --
backend/server/rhnSQL/sql_lib.py | 4 ----
backend/server/rhnServer/search_notify.py | 1 -
backend/server/rhnServer/server_class.py | 3 +--
backend/server/rhnServer/server_lib.py | 3 +--
backend/server/rhnServer/server_packages.py | 4 ++--
backend/server/test/byterangetests.py | 2 --
backend/server/test/test_errata_import_webqa.py | 1 -
backend/server/test/test_queue_get.py | 2 +-
backend/spacewalk/common/fileutils.py | 1 -
backend/spacewalk/common/rhn_deb.py | 6 ------
backend/spacewalk/common/rhn_mpm.py | 2 +-
backend/spacewalk/common/rhn_rpm.py | 2 --
backend/test/runtests.py | 2 --
backend/test/unit/spacewalk/test/common/rhnLib-tests.py | 1 -
backend/test/unit/spacewalk/test/server/rhnsql-tests.py | 2 --
backend/test/unit/spacewalk/test/setpath.py | 1 -
backend/wsgi/wsgiHandler.py | 3 ---
backend/wsgi/wsgiRequest.py | 1 -
client/rhel/rhnlib/rhn/SSL.py | 3 +--
client/rhel/rhnlib/rhn/SmartIO.py | 1 -
client/rhel/rhnlib/rhn/rpclib.py | 3 ---
client/rhel/rhnlib/test/00-connection.py | 2 --
client/rhel/rhnlib/test/04-authenticated-proxy.py | 1 -
client/rhel/rhnlib/test/05-delete-packages.py | 1 -
client/rhel/rhnlib/test/06-leaking-ssl-fd.py | 1 -
client/rhel/rhnlib/test/07-leaking-ssl-fd.py | 1 -
client/rhel/rhnlib/test/08-leaking-fd.py | 1 -
client/rhel/rhnlib/test/15-ranges.py | 1 -
client/rhel/rhnlib/test/16-test-ranges.py | 1 -
client/rhel/yum-rhn-plugin/actions/packages.py | 1 -
client/tools/action-rpms/rhn-applet-actions/rhn_applet.py | 3 ---
client/tools/osad/src/dispatcher_client.py | 2 +-
client/tools/osad/src/jabber_lib.py | 1 -
client/tools/osad/src/osa_dispatcher.py | 1 -
client/tools/osad/src/osad.py | 2 +-
client/tools/osad/src/osad_client.py | 2 +-
client/tools/osad/test/simple-client.py | 1 -
client/tools/osad/test/simple-dispatcher.py | 1 -
client/tools/rhn-virtualization/virtualization/domain_control.py | 4 +---
client/tools/rhn-virtualization/virtualization/poller.py | 3 +--
client/tools/rhn-virtualization/virtualization/schedule_poller.py | 2 --
client/tools/rhn-virtualization/virtualization/support.py | 8 +-------
client/tools/rhncfg/actions/ModeController.py | 1 -
client/tools/rhncfg/actions/ModeControllerCreator.py | 1 -
client/tools/rhncfg/actions/Modes.py | 3 ---
client/tools/rhncfg/actions/configfiles.py | 2 +-
client/tools/rhncfg/actions/rhn-actions-control.py | 2 --
client/tools/rhncfg/config_client/rhncfgcli_channels.py | 4 +---
client/tools/rhncfg/config_client/rhncfgcli_diff.py | 3 ---
client/tools/rhncfg/config_client/rhncfgcli_get.py | 3 +--
client/tools/rhncfg/config_client/rhncfgcli_list.py | 1 -
client/tools/rhncfg/config_common/file_utils.py | 1 -
client/tools/rhncfg/config_common/repository.py | 4 ++--
client/tools/rhncfg/config_common/rpc_wrapper.py | 2 --
client/tools/rhncfg/config_common/transactions.py | 1 -
client/tools/rhncfg/config_management/rhncfg_diff_revisions.py | 2 +-
client/tools/rhncfg/config_management/rhncfg_download_channel.py | 2 +-
client/tools/rhncfg/config_management/rhncfg_remove.py | 2 +-
client/tools/rhncfg/config_management/rhncfg_upload_channel.py | 1 -
client/tools/rhncfg/config_management/rpc_repository.py | 1 -
client/tools/rhncfg/test/test_action_deploy.py | 1 -
client/tools/rhncfg/test/test_action_diff.py | 1 -
client/tools/rhnpush/archive.py | 3 ---
client/tools/rhnpush/rhnpush.py | 2 --
client/tools/rhnpush/rhnpush_cache.py | 4 ----
client/tools/rhnpush/rhnpush_config.py | 2 --
client/tools/rhnpush/rhnpush_confmanager.py | 8 +-------
client/tools/rhnpush/rhnpush_v2.py | 2 --
client/tools/rhnpush/rpm2mpm.py | 5 +----
client/tools/rhnpush/solaris2mpm.py | 2 --
client/tools/rhnpush/test/testRhnpushConfig.py | 1 -
client/tools/rhnpush/test/testUtils.py | 1 -
client/tools/rhnpush/test/test_archive.py | 2 --
client/tools/rhnpush/utils.py | 3 ---
contrib/rhn-clone-errata.py | 1 -
proxy/installer/rhn_proxy_activate.py | 2 --
proxy/proxy/apacheServer.py | 3 ---
proxy/proxy/broker/rhnBroker.py | 2 +-
proxy/proxy/pm/rhn_package_manager.py | 1 -
proxy/proxy/pm/uploadLib.py | 7 -------
proxy/proxy/redirect/rhnRedirect.py | 1 -
proxy/proxy/rhnAuthProtocol.py | 2 +-
proxy/proxy/rhnProxyAuth.py | 2 --
proxy/proxy/xxmlrpclib.py | 2 +-
spacewalk/certs-tools/client_config_update.py | 1 -
spacewalk/certs-tools/rhn_bootstrap_strings.py | 1 -
spacewalk/certs-tools/sslToolCli.py | 1 -
98 files changed, 31 insertions(+), 179 deletions(-)
New commits:
commit 03997b65b46433e8a7e8adc6f0b66185f242ff06
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Nov 24 10:29:37 2010 +0100
removed unused imports
diff --git a/spacewalk/certs-tools/client_config_update.py
b/spacewalk/certs-tools/client_config_update.py
index e595b62..d605d28 100755
--- a/spacewalk/certs-tools/client_config_update.py
+++ b/spacewalk/certs-tools/client_config_update.py
@@ -64,7 +64,6 @@ mapped as well:
import os
import sys
-import time
import string
import tempfile
diff --git a/spacewalk/certs-tools/rhn_bootstrap_strings.py
b/spacewalk/certs-tools/rhn_bootstrap_strings.py
index 8a57077..e2938fa 100644
--- a/spacewalk/certs-tools/rhn_bootstrap_strings.py
+++ b/spacewalk/certs-tools/rhn_bootstrap_strings.py
@@ -17,7 +17,6 @@
#
# $Id$
-import string
import os.path
diff --git a/spacewalk/certs-tools/sslToolCli.py b/spacewalk/certs-tools/sslToolCli.py
index 6e67ad1..894027d 100644
--- a/spacewalk/certs-tools/sslToolCli.py
+++ b/spacewalk/certs-tools/sslToolCli.py
@@ -22,7 +22,6 @@
## language imports
import os
import sys
-import string
## utitily imports
from optparse import Option, OptionParser, make_option
commit 94addd571f4538d4351e0b436edb6d1a10c087e3
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Nov 24 10:29:37 2010 +0100
removed unused imports
diff --git a/proxy/installer/rhn_proxy_activate.py
b/proxy/installer/rhn_proxy_activate.py
index 52e03dc..39e18b0 100644
--- a/proxy/installer/rhn_proxy_activate.py
+++ b/proxy/installer/rhn_proxy_activate.py
@@ -27,11 +27,9 @@
import os
import re
import sys
-import pwd
import string
import socket
import urlparse
-import xmlrpclib
## lib imports
from rhn import rpclib, SSL
diff --git a/proxy/proxy/apacheServer.py b/proxy/proxy/apacheServer.py
index 9ec1be8..e898612 100644
--- a/proxy/proxy/apacheServer.py
+++ b/proxy/proxy/apacheServer.py
@@ -16,9 +16,6 @@
#-------------------------------------------------------------------------------
# $Id: apacheServer.py,v 1.81 2005/07/05 17:39:03 wregglej Exp $
-# system module imports
-import os
-
# common module imports
from spacewalk.common import CFG, initCFG, initLOG, log_setreq, Traceback, \
log_debug, apache
diff --git a/proxy/proxy/broker/rhnBroker.py b/proxy/proxy/broker/rhnBroker.py
index abb14b0..9d64692 100644
--- a/proxy/proxy/broker/rhnBroker.py
+++ b/proxy/proxy/broker/rhnBroker.py
@@ -24,7 +24,7 @@ import re
# common module imports
from spacewalk.common.rhnLib import parseUrl
from spacewalk.common import UserDictCase, rhnFlags, log_debug, log_error, CFG, \
- rhnFault, rhnException, apache
+ rhnFault, apache
from spacewalk.common.rhnTranslate import _
# local module imports
diff --git a/proxy/proxy/pm/rhn_package_manager.py
b/proxy/proxy/pm/rhn_package_manager.py
index 4c1ab13..58d36a2 100755
--- a/proxy/proxy/pm/rhn_package_manager.py
+++ b/proxy/proxy/pm/rhn_package_manager.py
@@ -36,7 +36,6 @@ import os
import sys
import string
import shutil
-from types import IntType, StringType
from operator import truth
from rhnpush.uploadLib import UploadError
try:
diff --git a/proxy/proxy/pm/uploadLib.py b/proxy/proxy/pm/uploadLib.py
index e8bc48a..eceeec9 100644
--- a/proxy/proxy/pm/uploadLib.py
+++ b/proxy/proxy/pm/uploadLib.py
@@ -14,13 +14,6 @@
# in this software or its documentation.
#
-# system imports
-import os
-import sys
-import string
-import fnmatch
-import getpass
-
# RHN imports
from spacewalk.common import rhn_mpm
from rhnpush import uploadLib
diff --git a/proxy/proxy/redirect/rhnRedirect.py b/proxy/proxy/redirect/rhnRedirect.py
index 7858134..d4139ba 100644
--- a/proxy/proxy/redirect/rhnRedirect.py
+++ b/proxy/proxy/redirect/rhnRedirect.py
@@ -21,7 +21,6 @@ import socket
import re
# common module imports
-from spacewalk.common.rhnLib import parseUrl
from spacewalk.common import log_debug, log_error, CFG, rhnFlags, rhnFault, rhnLib, \
Traceback, apache
from spacewalk.common.rhnTranslate import _
diff --git a/proxy/proxy/rhnAuthProtocol.py b/proxy/proxy/rhnAuthProtocol.py
index fee7539..a12b6c2 100644
--- a/proxy/proxy/rhnAuthProtocol.py
+++ b/proxy/proxy/rhnAuthProtocol.py
@@ -19,7 +19,7 @@
import struct
## local imports
-from xxmlrpclib import Fault, dumps, loads
+from xxmlrpclib import dumps, loads
class CommunicationError(Exception):
diff --git a/proxy/proxy/rhnProxyAuth.py b/proxy/proxy/rhnProxyAuth.py
index af49e21..37220c4 100644
--- a/proxy/proxy/rhnProxyAuth.py
+++ b/proxy/proxy/rhnProxyAuth.py
@@ -18,11 +18,9 @@
## system imports
import os
-import sys
import time
import string
import socket
-import urlparse
## local imports
import rhnAuthCacheClient
diff --git a/proxy/proxy/xxmlrpclib.py b/proxy/proxy/xxmlrpclib.py
index 12333e2..f8d9d8d 100644
--- a/proxy/proxy/xxmlrpclib.py
+++ b/proxy/proxy/xxmlrpclib.py
@@ -25,7 +25,7 @@ from types import NoneType, InstanceType
from rhn import rpclib
## local imports
-from spacewalk.common import log_error, UserDictCase
+from spacewalk.common import UserDictCase
class Marshaller(rpclib.xmlrpclib.Marshaller):
""" Marshaller that understands NoneTypes
commit 809a0ef43b0c01bb099b7eb49b84f68a4ed4c3b8
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Nov 24 10:29:37 2010 +0100
removed unused imports
diff --git a/contrib/rhn-clone-errata.py b/contrib/rhn-clone-errata.py
index 2707b47..4d5d451 100755
--- a/contrib/rhn-clone-errata.py
+++ b/contrib/rhn-clone-errata.py
@@ -22,7 +22,6 @@
import xmlrpclib
from optparse import OptionParser
import sys
-import os
class RHNServer:
def __init__(self,servername,user,passwd):
commit 41ab1dbe63ce688aa652a6d5982de49f77837179
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Nov 24 10:29:37 2010 +0100
removed unused imports
diff --git a/client/tools/rhnpush/archive.py b/client/tools/rhnpush/archive.py
index 3238cb6..8c9ea26 100644
--- a/client/tools/rhnpush/archive.py
+++ b/client/tools/rhnpush/archive.py
@@ -18,10 +18,7 @@
import os
import subprocess
import shutil
-import sys
import tempfile
-import time
-import zipfile
import select
# exceptions -------------------------------------------------------------
diff --git a/client/tools/rhnpush/rhnpush.py b/client/tools/rhnpush/rhnpush.py
index f8af13c..5a74fd6 100755
--- a/client/tools/rhnpush/rhnpush.py
+++ b/client/tools/rhnpush/rhnpush.py
@@ -35,10 +35,8 @@ import sys
import string
import time
import urlparse
-import rhnpush_cache
import rhnpush_confmanager
-from types import IntType, StringType
try:
from optparse import Option, OptionParser
except ImportError:
diff --git a/client/tools/rhnpush/rhnpush_cache.py
b/client/tools/rhnpush/rhnpush_cache.py
index b09382b..c7db479 100644
--- a/client/tools/rhnpush/rhnpush_cache.py
+++ b/client/tools/rhnpush/rhnpush_cache.py
@@ -22,11 +22,7 @@
#
# CacheManager - Controls access to the cache.
-import time
-import string
-import pickle
import utils
-import sys
import os
True = 1
diff --git a/client/tools/rhnpush/rhnpush_config.py
b/client/tools/rhnpush/rhnpush_config.py
index a48b0b5..b8e732a 100644
--- a/client/tools/rhnpush/rhnpush_config.py
+++ b/client/tools/rhnpush/rhnpush_config.py
@@ -19,10 +19,8 @@
# 11/11/2004 John Wregglesworth
#
-import os
import sys
import ConfigParser
-import utils
True = 1
False = 0
diff --git a/client/tools/rhnpush/rhnpush_confmanager.py
b/client/tools/rhnpush/rhnpush_confmanager.py
index 13ec7d9..9c72d82 100644
--- a/client/tools/rhnpush/rhnpush_confmanager.py
+++ b/client/tools/rhnpush/rhnpush_confmanager.py
@@ -17,13 +17,7 @@ import rhnpush_config
import utils
import string
import sys
-import os, os.path
-
-
-try:
- from optparse import Option, OptionParser
-except ImportError:
- from optik import Option, OptionParser
+import os
True = 1
diff --git a/client/tools/rhnpush/rhnpush_v2.py b/client/tools/rhnpush/rhnpush_v2.py
index db74a67..5deb4d3 100644
--- a/client/tools/rhnpush/rhnpush_v2.py
+++ b/client/tools/rhnpush/rhnpush_v2.py
@@ -18,10 +18,8 @@
#
# $Id$
-import sys
import string
import base64
-from cStringIO import StringIO
import connection
diff --git a/client/tools/rhnpush/rpm2mpm.py b/client/tools/rhnpush/rpm2mpm.py
index ad856f2..1c80b78 100644
--- a/client/tools/rhnpush/rpm2mpm.py
+++ b/client/tools/rhnpush/rpm2mpm.py
@@ -15,10 +15,7 @@
import sys
import time
-import xmlrpclib
-from types import ListType, TupleType, DictType
-import gzip
-import cStringIO
+from types import ListType, TupleType
from spacewalk.common import rhn_rpm, rhn_mpm
diff --git a/client/tools/rhnpush/solaris2mpm.py b/client/tools/rhnpush/solaris2mpm.py
index 10e6a7d..f4a8d83 100644
--- a/client/tools/rhnpush/solaris2mpm.py
+++ b/client/tools/rhnpush/solaris2mpm.py
@@ -19,10 +19,8 @@ import optparse
import os
import re
import socket
-import StringIO
import string
import sys
-import traceback
import time
try:
diff --git a/client/tools/rhnpush/test/testRhnpushConfig.py
b/client/tools/rhnpush/test/testRhnpushConfig.py
index c44e779..5bb9284 100644
--- a/client/tools/rhnpush/test/testRhnpushConfig.py
+++ b/client/tools/rhnpush/test/testRhnpushConfig.py
@@ -15,7 +15,6 @@
import rhnpush_config
import unittest
-import time
class RhnConfigTestCase(unittest.TestCase):
diff --git a/client/tools/rhnpush/test/testUtils.py
b/client/tools/rhnpush/test/testUtils.py
index c4afb1f..d1e0e05 100644
--- a/client/tools/rhnpush/test/testUtils.py
+++ b/client/tools/rhnpush/test/testUtils.py
@@ -14,7 +14,6 @@
#
import unittest
-import time
import utils
True = 1
diff --git a/client/tools/rhnpush/test/test_archive.py
b/client/tools/rhnpush/test/test_archive.py
index b68bbd7..569915a 100644
--- a/client/tools/rhnpush/test/test_archive.py
+++ b/client/tools/rhnpush/test/test_archive.py
@@ -14,8 +14,6 @@
#
import os
-import shutil
-import tempfile
import unittest
import zipfile
diff --git a/client/tools/rhnpush/utils.py b/client/tools/rhnpush/utils.py
index aa56da2..f0a243a 100644
--- a/client/tools/rhnpush/utils.py
+++ b/client/tools/rhnpush/utils.py
@@ -14,9 +14,6 @@
#
import os
-import sys
-import string
-import time
import pwd
def get_home_dir():
commit 45576fca5fe6156e93c2c5d0f14e4a714cd6139d
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Nov 24 10:29:37 2010 +0100
removed unused imports
diff --git a/client/tools/rhncfg/actions/ModeController.py
b/client/tools/rhncfg/actions/ModeController.py
index e168180..97ee577 100644
--- a/client/tools/rhncfg/actions/ModeController.py
+++ b/client/tools/rhncfg/actions/ModeController.py
@@ -13,7 +13,6 @@
# in this software or its documentation.
#
-import os
import sys
import string
diff --git a/client/tools/rhncfg/actions/ModeControllerCreator.py
b/client/tools/rhncfg/actions/ModeControllerCreator.py
index 11875f7..15663cb 100644
--- a/client/tools/rhncfg/actions/ModeControllerCreator.py
+++ b/client/tools/rhncfg/actions/ModeControllerCreator.py
@@ -13,7 +13,6 @@
# in this software or its documentation.
#
-import os
import sys
import string
import ModeController
diff --git a/client/tools/rhncfg/actions/Modes.py b/client/tools/rhncfg/actions/Modes.py
index 4bbef01..3523a57 100644
--- a/client/tools/rhncfg/actions/Modes.py
+++ b/client/tools/rhncfg/actions/Modes.py
@@ -14,9 +14,6 @@
#
import os
-import os.path
-import sys
-import string
#Forgot about AS 2.1.
True = 1
diff --git a/client/tools/rhncfg/actions/configfiles.py
b/client/tools/rhncfg/actions/configfiles.py
index c89028e..0933aac 100755
--- a/client/tools/rhncfg/actions/configfiles.py
+++ b/client/tools/rhncfg/actions/configfiles.py
@@ -16,7 +16,7 @@
import os
import time
-from config_common import local_config, file_utils, utils, repository, cfg_exceptions
+from config_common import local_config, file_utils, utils, cfg_exceptions
from config_common.rhn_log import set_debug_level, get_debug_level, set_logfile,
log_to_file
from config_common.transactions import DeployTransaction, FailedRollback
diff --git a/client/tools/rhncfg/actions/rhn-actions-control.py
b/client/tools/rhncfg/actions/rhn-actions-control.py
index f70036c..7ffe98f 100755
--- a/client/tools/rhncfg/actions/rhn-actions-control.py
+++ b/client/tools/rhncfg/actions/rhn-actions-control.py
@@ -14,9 +14,7 @@
# in this software or its documentation.
#
-import os
import sys
-import string
import ModeControllerCreator
from optparse import Option, OptionParser
diff --git a/client/tools/rhncfg/config_client/rhncfgcli_channels.py
b/client/tools/rhncfg/config_client/rhncfgcli_channels.py
index 9c08998..c05939e 100644
--- a/client/tools/rhncfg/config_client/rhncfgcli_channels.py
+++ b/client/tools/rhncfg/config_client/rhncfgcli_channels.py
@@ -13,9 +13,7 @@
# in this software or its documentation.
#
-from config_common import utils
-from config_common.rhn_log import log_debug, die
-from config_common.rhn_rpc import rpclib
+from config_common.rhn_log import log_debug
import handler_base
diff --git a/client/tools/rhncfg/config_client/rhncfgcli_diff.py
b/client/tools/rhncfg/config_client/rhncfgcli_diff.py
index db0a581..83b8477 100644
--- a/client/tools/rhncfg/config_client/rhncfgcli_diff.py
+++ b/client/tools/rhncfg/config_client/rhncfgcli_diff.py
@@ -15,9 +15,6 @@
import sys
import os
-import os.path
-from config_common import utils
-from config_common.rhn_log import log_debug
import handler_base
diff --git a/client/tools/rhncfg/config_client/rhncfgcli_get.py
b/client/tools/rhncfg/config_client/rhncfgcli_get.py
index 5a8d200..d19bb5e 100644
--- a/client/tools/rhncfg/config_client/rhncfgcli_get.py
+++ b/client/tools/rhncfg/config_client/rhncfgcli_get.py
@@ -15,8 +15,7 @@
import os
-from config_common import utils, cfg_exceptions
-from config_common.rhn_log import log_debug
+from config_common import cfg_exceptions
from config_common.transactions import DeployTransaction, FailedRollback
import handler_base
diff --git a/client/tools/rhncfg/config_client/rhncfgcli_list.py
b/client/tools/rhncfg/config_client/rhncfgcli_list.py
index e1f5dd1..993caef 100644
--- a/client/tools/rhncfg/config_client/rhncfgcli_list.py
+++ b/client/tools/rhncfg/config_client/rhncfgcli_list.py
@@ -13,7 +13,6 @@
# in this software or its documentation.
#
-from config_common import utils
from config_common.rhn_log import log_debug, die
import handler_base
diff --git a/client/tools/rhncfg/config_common/file_utils.py
b/client/tools/rhncfg/config_common/file_utils.py
index 1a1b333..a350a30 100644
--- a/client/tools/rhncfg/config_common/file_utils.py
+++ b/client/tools/rhncfg/config_common/file_utils.py
@@ -18,7 +18,6 @@ import os.path
import time
import tempfile
import base64
-from config_common.rhn_log import log_debug
try:
from selinux import lgetfilecon
except:
diff --git a/client/tools/rhncfg/config_common/repository.py
b/client/tools/rhncfg/config_common/repository.py
index dfa6bb8..6be429d 100644
--- a/client/tools/rhncfg/config_common/repository.py
+++ b/client/tools/rhncfg/config_common/repository.py
@@ -25,8 +25,8 @@ import local_config
import base64
import utils
-from rhn_log import log_debug, die
-#from rhn_rpc import rpclib
+from rhn_log import log_debug
+
try:
from selinux import lgetfilecon
except:
diff --git a/client/tools/rhncfg/config_common/rpc_wrapper.py
b/client/tools/rhncfg/config_common/rpc_wrapper.py
index 4dfc152..3de6729 100644
--- a/client/tools/rhncfg/config_common/rpc_wrapper.py
+++ b/client/tools/rhncfg/config_common/rpc_wrapper.py
@@ -13,10 +13,8 @@
# in this software or its documentation.
#
-import os
import sys
import string
-import utils
from rhn_rpc import rpclib
try:
from socket import error, sslerror, herror, gaierror, timeout
diff --git a/client/tools/rhncfg/config_common/transactions.py
b/client/tools/rhncfg/config_common/transactions.py
index f9be792..9582277 100644
--- a/client/tools/rhncfg/config_common/transactions.py
+++ b/client/tools/rhncfg/config_common/transactions.py
@@ -20,7 +20,6 @@ import grp
import sys
import errno
import shutil
-import traceback
import string
from config_common import file_utils, utils, cfg_exceptions
diff --git a/client/tools/rhncfg/config_management/rhncfg_diff_revisions.py
b/client/tools/rhncfg/config_management/rhncfg_diff_revisions.py
index 0f97e24..7b9ecd5 100644
--- a/client/tools/rhncfg/config_management/rhncfg_diff_revisions.py
+++ b/client/tools/rhncfg/config_management/rhncfg_diff_revisions.py
@@ -15,7 +15,7 @@
import sys
-from config_common import handler_base, utils, cfg_exceptions
+from config_common import handler_base, cfg_exceptions
from config_common.rhn_log import log_debug, die
class Handler(handler_base.HandlerBase):
diff --git a/client/tools/rhncfg/config_management/rhncfg_download_channel.py
b/client/tools/rhncfg/config_management/rhncfg_download_channel.py
index 6219a25..42ea5b4 100644
--- a/client/tools/rhncfg/config_management/rhncfg_download_channel.py
+++ b/client/tools/rhncfg/config_management/rhncfg_download_channel.py
@@ -15,7 +15,7 @@
import os
-from config_common import handler_base, utils, cfg_exceptions
+from config_common import handler_base, utils
from config_common.rhn_log import log_debug, die
class Handler(handler_base.HandlerBase):
diff --git a/client/tools/rhncfg/config_management/rhncfg_remove.py
b/client/tools/rhncfg/config_management/rhncfg_remove.py
index bd503c3..ae17ed8 100644
--- a/client/tools/rhncfg/config_management/rhncfg_remove.py
+++ b/client/tools/rhncfg/config_management/rhncfg_remove.py
@@ -14,7 +14,7 @@
#
import os
-from config_common import handler_base, utils, cfg_exceptions, repository
+from config_common import handler_base, utils, repository
from config_common.rhn_log import log_debug, die
class Handler(handler_base.HandlerBase):
diff --git a/client/tools/rhncfg/config_management/rhncfg_upload_channel.py
b/client/tools/rhncfg/config_management/rhncfg_upload_channel.py
index 1d2e59d..0944df8 100644
--- a/client/tools/rhncfg/config_management/rhncfg_upload_channel.py
+++ b/client/tools/rhncfg/config_management/rhncfg_upload_channel.py
@@ -14,7 +14,6 @@
#
import os
-import sys
import string
from config_common import handler_base, utils, cfg_exceptions
diff --git a/client/tools/rhncfg/config_management/rpc_repository.py
b/client/tools/rhncfg/config_management/rpc_repository.py
index c531773..ab53629 100644
--- a/client/tools/rhncfg/config_management/rpc_repository.py
+++ b/client/tools/rhncfg/config_management/rpc_repository.py
@@ -15,7 +15,6 @@
import os
import tempfile
-import base64
from config_common import cfg_exceptions, repository, utils, file_utils
from config_common.rhn_log import log_debug
diff --git a/client/tools/rhncfg/test/test_action_deploy.py
b/client/tools/rhncfg/test/test_action_deploy.py
index c181161..ad57558 100644
--- a/client/tools/rhncfg/test/test_action_deploy.py
+++ b/client/tools/rhncfg/test/test_action_deploy.py
@@ -15,7 +15,6 @@
import os
import fnmatch
-import sys
from actions import configfiles
from config_common import local_config, rhn_log
diff --git a/client/tools/rhncfg/test/test_action_diff.py
b/client/tools/rhncfg/test/test_action_diff.py
index b9a61be..2d8e7ac 100644
--- a/client/tools/rhncfg/test/test_action_diff.py
+++ b/client/tools/rhncfg/test/test_action_diff.py
@@ -14,7 +14,6 @@
#
from actions import configfiles
-from config_common import local_config
print configfiles.diff([
{
commit 499ea512db9ed09e97ae69f65ec298e3b8069eb8
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Nov 24 10:29:37 2010 +0100
removed unused imports
diff --git a/client/tools/rhn-virtualization/virtualization/domain_control.py
b/client/tools/rhn-virtualization/virtualization/domain_control.py
index 4faa413..4692b7a 100755
--- a/client/tools/rhn-virtualization/virtualization/domain_control.py
+++ b/client/tools/rhn-virtualization/virtualization/domain_control.py
@@ -9,9 +9,7 @@
import sys
sys.path.append("/usr/share/rhn/")
-import os
-
-from virtualization import poller, start_domain, state
+from virtualization import poller, start_domain
from virtualization.errors import VirtualizationException
from virtualization.util import hyphenize_uuid
diff --git a/client/tools/rhn-virtualization/virtualization/poller.py
b/client/tools/rhn-virtualization/virtualization/poller.py
index 0a62ecf..87a7ccd 100644
--- a/client/tools/rhn-virtualization/virtualization/poller.py
+++ b/client/tools/rhn-virtualization/virtualization/poller.py
@@ -29,8 +29,7 @@ from optparse import OptionParser
from virtualization.state import State
from virtualization.errors import VirtualizationException
-from virtualization.constants import StateType, \
- PropertyType, \
+from virtualization.constants import PropertyType, \
VirtualizationType, \
IdentityType, \
VIRT_STATE_NAME_MAP, \
diff --git a/client/tools/rhn-virtualization/virtualization/schedule_poller.py
b/client/tools/rhn-virtualization/virtualization/schedule_poller.py
index bfb4a1d..4f793df 100644
--- a/client/tools/rhn-virtualization/virtualization/schedule_poller.py
+++ b/client/tools/rhn-virtualization/virtualization/schedule_poller.py
@@ -13,12 +13,10 @@
# in this software or its documentation.
#
-import os
import sys
sys.path.append("/usr/share/rhn")
import string
import types
-import tempfile
import commands
def create_crontab_line(minute = None,\
diff --git a/client/tools/rhn-virtualization/virtualization/support.py
b/client/tools/rhn-virtualization/virtualization/support.py
index a29c7fc..61f2284 100755
--- a/client/tools/rhn-virtualization/virtualization/support.py
+++ b/client/tools/rhn-virtualization/virtualization/support.py
@@ -16,21 +16,15 @@
import sys
sys.path.append("/usr/share/rhn/")
-import os
-
from virtualization import domain_control, poller, schedule_poller
-from virtualization.errors import VirtualizationException, \
- UUIDError
-from virtualization.constants import StateType, \
- IdentityType, \
+from virtualization.constants import IdentityType, \
PropertyType
from virtualization.notification import Plan, \
EventType, \
TargetType
from virtualization.domain_config import DomainConfig
from virtualization.domain_directory import DomainDirectory
-from virtualization.util import dehyphenize_uuid
try:
import libvirt
commit 7c6c5a340d6eba37601e29003a95bbbab00cb8d1
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Nov 24 10:29:37 2010 +0100
removed unused imports
diff --git a/client/tools/osad/src/dispatcher_client.py
b/client/tools/osad/src/dispatcher_client.py
index 918241d..8e5fb37 100644
--- a/client/tools/osad/src/dispatcher_client.py
+++ b/client/tools/osad/src/dispatcher_client.py
@@ -14,7 +14,7 @@
#
import time
-from spacewalk.common import log_debug, log_error
+from spacewalk.common import log_debug
from spacewalk.server import rhnSQL
import jabber_lib
diff --git a/client/tools/osad/src/jabber_lib.py b/client/tools/osad/src/jabber_lib.py
index 0e88542..b416ac7 100644
--- a/client/tools/osad/src/jabber_lib.py
+++ b/client/tools/osad/src/jabber_lib.py
@@ -17,7 +17,6 @@ import os
import hashlib
import sys
import time
-import types
import select
import socket
import jabber
diff --git a/client/tools/osad/src/osa_dispatcher.py
b/client/tools/osad/src/osa_dispatcher.py
index 2805eb5..048e1d5 100644
--- a/client/tools/osad/src/osa_dispatcher.py
+++ b/client/tools/osad/src/osa_dispatcher.py
@@ -15,7 +15,6 @@
import sys
import select
-import time
import socket
import SocketServer
from spacewalk.common import initCFG, CFG, initLOG, log_debug, log_error
diff --git a/client/tools/osad/src/osad.py b/client/tools/osad/src/osad.py
index 7220eac..fecb8c4 100644
--- a/client/tools/osad/src/osad.py
+++ b/client/tools/osad/src/osad.py
@@ -23,7 +23,7 @@ import random
from up2date_client.config import initUp2dateConfig
-from rhn_log import set_debug_level, log_debug, log_error, die, set_logfile
+from rhn_log import set_debug_level, log_debug, die, set_logfile
import jabber_lib
import osad_config
diff --git a/client/tools/osad/src/osad_client.py b/client/tools/osad/src/osad_client.py
index 41f54a4..8b24201 100644
--- a/client/tools/osad/src/osad_client.py
+++ b/client/tools/osad/src/osad_client.py
@@ -18,7 +18,7 @@ import time
import string
import jabber_lib
-from rhn_log import log_debug, log_error, die
+from rhn_log import log_debug
class Client(jabber_lib.JabberClient):
def __init__(self, *args, **kwargs):
diff --git a/client/tools/osad/test/simple-client.py
b/client/tools/osad/test/simple-client.py
index 4721b25..b8d4362 100644
--- a/client/tools/osad/test/simple-client.py
+++ b/client/tools/osad/test/simple-client.py
@@ -14,7 +14,6 @@
#
import sys
-import time
import jabber_lib
import test_lib
diff --git a/client/tools/osad/test/simple-dispatcher.py
b/client/tools/osad/test/simple-dispatcher.py
index 84f0ccf..a5de6cd 100644
--- a/client/tools/osad/test/simple-dispatcher.py
+++ b/client/tools/osad/test/simple-dispatcher.py
@@ -14,7 +14,6 @@
#
import sys
-import time
import test_lib
commit 11f90ed7f454a17d7322d636612b7bf05bff1205
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Nov 24 10:29:37 2010 +0100
removed unused imports
diff --git a/client/tools/action-rpms/rhn-applet-actions/rhn_applet.py
b/client/tools/action-rpms/rhn-applet-actions/rhn_applet.py
index eef05f1..991401d 100755
--- a/client/tools/action-rpms/rhn-applet-actions/rhn_applet.py
+++ b/client/tools/action-rpms/rhn-applet-actions/rhn_applet.py
@@ -18,12 +18,9 @@ import os
import sys
import string
import re
-import shutil
sys.path.append("/usr/share/rhn")
-from up2date_client import up2date
from up2date_client import config
-from up2date_client import configUtils
from up2date_client import up2dateAuth
from rhn import rpclib
commit 550dc2a67bb70e7053e84d68e9d2cc6a487f594b
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Nov 24 10:29:37 2010 +0100
removed unused imports
diff --git a/client/rhel/yum-rhn-plugin/actions/packages.py
b/client/rhel/yum-rhn-plugin/actions/packages.py
index 5c8e096..b1e782f 100644
--- a/client/rhel/yum-rhn-plugin/actions/packages.py
+++ b/client/rhel/yum-rhn-plugin/actions/packages.py
@@ -30,7 +30,6 @@ from up2date_client import up2dateLog
from up2date_client import config
from up2date_client import rpmUtils
from up2date_client import rhnPackageInfo
-from up2date_client import rhncli
from rpm import RPMPROB_FILTER_OLDPACKAGE
commit 46474f82bf02ce7d9b2f036758094c835762281a
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Nov 24 11:11:28 2010 +0100
removed unused imports
diff --git a/client/rhel/rhnlib/rhn/SSL.py b/client/rhel/rhnlib/rhn/SSL.py
index 8437474..d5ca7da 100644
--- a/client/rhel/rhnlib/rhn/SSL.py
+++ b/client/rhel/rhnlib/rhn/SSL.py
@@ -11,9 +11,8 @@
rhn.SSL builds an abstraction on top of the objects provided by pyOpenSSL
"""
-from OpenSSL import SSL, crypto
+from OpenSSL import SSL
import os
-import time
import socket
import select
diff --git a/client/rhel/rhnlib/rhn/SmartIO.py b/client/rhel/rhnlib/rhn/SmartIO.py
index c397789..c048caa 100644
--- a/client/rhel/rhnlib/rhn/SmartIO.py
+++ b/client/rhel/rhnlib/rhn/SmartIO.py
@@ -11,7 +11,6 @@ This module implements the SmartIO class
"""
import os
-import time
from cStringIO import StringIO
class SmartIO:
diff --git a/client/rhel/rhnlib/rhn/rpclib.py b/client/rhel/rhnlib/rhn/rpclib.py
index 9bd2707..1f3b0c6 100644
--- a/client/rhel/rhnlib/rhn/rpclib.py
+++ b/client/rhel/rhnlib/rhn/rpclib.py
@@ -27,9 +27,6 @@ from types import ListType, TupleType, StringType, UnicodeType,
DictType, Dictio
from UserDictCase import UserDictCase
import xmlrpclib
-from xmlrpclib import Fault, ResponseError, ProtocolError, getparser
-
-from transports import File
# Redirection handling
diff --git a/client/rhel/rhnlib/test/00-connection.py
b/client/rhel/rhnlib/test/00-connection.py
index c42a29b..907a3d5 100755
--- a/client/rhel/rhnlib/test/00-connection.py
+++ b/client/rhel/rhnlib/test/00-connection.py
@@ -9,8 +9,6 @@
import sys
sys.path.append('..')
from rhn.rpclib import Server
-from rhn.connections import HTTPProxyConnection, HTTPSConnection, HTTPSProxyConnection
-from rhn.transports import Output
SERVER = "xmlrpc.rhn.redhat.com"
HANDLER = "/XMLRPC"
diff --git a/client/rhel/rhnlib/test/04-authenticated-proxy.py
b/client/rhel/rhnlib/test/04-authenticated-proxy.py
index 559fc6a..4e0446b 100755
--- a/client/rhel/rhnlib/test/04-authenticated-proxy.py
+++ b/client/rhel/rhnlib/test/04-authenticated-proxy.py
@@ -10,7 +10,6 @@ import sys
import httplib
sys.path.append('..')
from rhn.rpclib import Server
-from rhn.connections import HTTPProxyConnection, HTTPSProxyConnection
SERVER = "xmlrpc.rhn.redhat.com"
HANDLER = "/XMLRPC"
diff --git a/client/rhel/rhnlib/test/05-delete-packages.py
b/client/rhel/rhnlib/test/05-delete-packages.py
index 40df072..2aaf081 100644
--- a/client/rhel/rhnlib/test/05-delete-packages.py
+++ b/client/rhel/rhnlib/test/05-delete-packages.py
@@ -9,7 +9,6 @@
import sys
-import httplib
sys.path.append('..')
from rhn.rpclib import Server
diff --git a/client/rhel/rhnlib/test/06-leaking-ssl-fd.py
b/client/rhel/rhnlib/test/06-leaking-ssl-fd.py
index 6c9eac0..0cb2f50 100644
--- a/client/rhel/rhnlib/test/06-leaking-ssl-fd.py
+++ b/client/rhel/rhnlib/test/06-leaking-ssl-fd.py
@@ -9,7 +9,6 @@
import os
import sys
-import httplib
sys.path.append('..')
from rhn.rpclib import Server
from threading import Thread
diff --git a/client/rhel/rhnlib/test/07-leaking-ssl-fd.py
b/client/rhel/rhnlib/test/07-leaking-ssl-fd.py
index c4416f1..89b48e5 100644
--- a/client/rhel/rhnlib/test/07-leaking-ssl-fd.py
+++ b/client/rhel/rhnlib/test/07-leaking-ssl-fd.py
@@ -8,7 +8,6 @@
import os
import sys
-import httplib
sys.path.append('..')
from rhn.rpclib import Server, GETServer
from threading import Thread
diff --git a/client/rhel/rhnlib/test/08-leaking-fd.py
b/client/rhel/rhnlib/test/08-leaking-fd.py
index 077ce8a..16c70b0 100644
--- a/client/rhel/rhnlib/test/08-leaking-fd.py
+++ b/client/rhel/rhnlib/test/08-leaking-fd.py
@@ -8,7 +8,6 @@
import os
import sys
-import httplib
sys.path.append('..')
from rhn.rpclib import Server, GETServer
from threading import Thread
diff --git a/client/rhel/rhnlib/test/15-ranges.py b/client/rhel/rhnlib/test/15-ranges.py
index 7f4ad93..ea4447d 100644
--- a/client/rhel/rhnlib/test/15-ranges.py
+++ b/client/rhel/rhnlib/test/15-ranges.py
@@ -4,7 +4,6 @@
#
# $Id$
-import string
import sys
sys.path.append('..')
from rhn import rpclib
diff --git a/client/rhel/rhnlib/test/16-test-ranges.py
b/client/rhel/rhnlib/test/16-test-ranges.py
index c3df9b8..0e06f6a 100644
--- a/client/rhel/rhnlib/test/16-test-ranges.py
+++ b/client/rhel/rhnlib/test/16-test-ranges.py
@@ -4,7 +4,6 @@
#
# $Id$
-import string
import sys
sys.path.append('..')
from rhn import rpclib
commit b9460a801525c73003e924b7e2bfe23be6232b06
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Nov 24 10:29:37 2010 +0100
removed unused imports
diff --git a/backend/spacewalk/common/fileutils.py
b/backend/spacewalk/common/fileutils.py
index 6951752..b026cff 100644
--- a/backend/spacewalk/common/fileutils.py
+++ b/backend/spacewalk/common/fileutils.py
@@ -17,7 +17,6 @@ import os
import sys
import pwd
import grp
-import time
import types
import shutil
import string
diff --git a/backend/spacewalk/common/rhn_deb.py b/backend/spacewalk/common/rhn_deb.py
index d7728af..45250e2 100644
--- a/backend/spacewalk/common/rhn_deb.py
+++ b/backend/spacewalk/common/rhn_deb.py
@@ -21,14 +21,8 @@
import os
import gzip
-import cStringIO
-import tempfile
-from rhn.rpclib import xmlrpclib
from debian import debfile
-import struct
-
-from types import ListType, TupleType, DictType
DEB_CHECKSUM_TYPE = 'md5' # FIXME: this should be a configuration option
diff --git a/backend/spacewalk/common/rhn_mpm.py b/backend/spacewalk/common/rhn_mpm.py
index 12bea83..463a6b5 100644
--- a/backend/spacewalk/common/rhn_mpm.py
+++ b/backend/spacewalk/common/rhn_mpm.py
@@ -21,7 +21,7 @@ from rhn.rpclib import xmlrpclib
import struct
-from types import ListType, TupleType, DictType
+from types import ListType, TupleType
MPM_CHECKSUM_TYPE = 'md5' # FIXME: this should be a configuration option
diff --git a/backend/spacewalk/common/rhn_rpm.py b/backend/spacewalk/common/rhn_rpm.py
index 7b74659..e0f9e3c 100644
--- a/backend/spacewalk/common/rhn_rpm.py
+++ b/backend/spacewalk/common/rhn_rpm.py
@@ -18,8 +18,6 @@ import sys
import rpm
import struct
-import exceptions
-
# Expose a bunch of useful constants from rpm
error = rpm.error
for sym, val in rpm.__dict__.items():
diff --git a/backend/test/runtests.py b/backend/test/runtests.py
index 4c9d27d..d0e3c35 100755
--- a/backend/test/runtests.py
+++ b/backend/test/runtests.py
@@ -29,8 +29,6 @@ sys.path.insert(0, '../')
sys.path.insert(0, './suites')
sys.path.insert(0, '../../client/rhel/rhnlib')
-from spacewalk.server import rhnSQL
-
# Import all test modules here:
import rhnsqltests
diff --git a/backend/test/unit/spacewalk/test/common/rhnLib-tests.py
b/backend/test/unit/spacewalk/test/common/rhnLib-tests.py
index fb7123c..97b4a18 100644
--- a/backend/test/unit/spacewalk/test/common/rhnLib-tests.py
+++ b/backend/test/unit/spacewalk/test/common/rhnLib-tests.py
@@ -15,7 +15,6 @@
import unittest
-import spacewalk.test.setpath
from spacewalk.common.rhnLib import parseUrl
class RhnLibTests(unittest.TestCase):
diff --git a/backend/test/unit/spacewalk/test/server/rhnsql-tests.py
b/backend/test/unit/spacewalk/test/server/rhnsql-tests.py
index 84a3ad9..926a9c9 100644
--- a/backend/test/unit/spacewalk/test/server/rhnsql-tests.py
+++ b/backend/test/unit/spacewalk/test/server/rhnsql-tests.py
@@ -20,9 +20,7 @@ NOTE: Not hitting the database here!
"""
import unittest
-import spacewalk.test.setpath
-from spacewalk.server import rhnSQL
from spacewalk.server.rhnSQL.driver_postgresql import convert_named_query_params
class RhnSQLTests(unittest.TestCase):
diff --git a/backend/test/unit/spacewalk/test/setpath.py
b/backend/test/unit/spacewalk/test/setpath.py
index 15296ba..8a92d8f 100644
--- a/backend/test/unit/spacewalk/test/setpath.py
+++ b/backend/test/unit/spacewalk/test/setpath.py
@@ -1,7 +1,6 @@
import sys
import os
import os.path
-import unittest
PYTHON_PATH_SETUP = False
diff --git a/backend/wsgi/wsgiHandler.py b/backend/wsgi/wsgiHandler.py
index 66a1f94..deefe20 100644
--- a/backend/wsgi/wsgiHandler.py
+++ b/backend/wsgi/wsgiHandler.py
@@ -14,11 +14,8 @@
#
#
-import os
from wsgi import wsgiRequest
-from spacewalk.common import log_debug
-
def handle(environ, start_response, server, component_type,
type="spacewalk.server.apacheServer"):
#wsgi seems to capitalize incoming headers and add HTTP- to the front :/
# so we strip out the first 5 letters, and transform it into what we want.
diff --git a/backend/wsgi/wsgiRequest.py b/backend/wsgi/wsgiRequest.py
index 27de686..fe37d54 100644
--- a/backend/wsgi/wsgiRequest.py
+++ b/backend/wsgi/wsgiRequest.py
@@ -17,7 +17,6 @@
import socket
-from spacewalk.common import log_debug
import httplib
commit 1580b24a935aee15650f9d45875099b2b6123037
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Nov 24 10:29:37 2010 +0100
removed unused imports
diff --git a/backend/server/rhnServer/search_notify.py
b/backend/server/rhnServer/search_notify.py
index d80b4fe..31268cb 100755
--- a/backend/server/rhnServer/search_notify.py
+++ b/backend/server/rhnServer/search_notify.py
@@ -15,7 +15,6 @@
# Sends notification to search-server that it should update server index
#
-import sys
import xmlrpclib
from spacewalk.common import log_error
diff --git a/backend/server/rhnServer/server_class.py
b/backend/server/rhnServer/server_class.py
index 20934fc..33c8e2c 100644
--- a/backend/server/rhnServer/server_class.py
+++ b/backend/server/rhnServer/server_class.py
@@ -20,7 +20,7 @@ import time
import string
from spacewalk.common import rhnException, rhnFault, log_debug, log_error, \
- CFG, rhnFlags, rhn_rpm
+ CFG, rhnFlags
from spacewalk.common.rhnTranslate import _
from spacewalk.server import rhnChannel, rhnUser, rhnSQL, rhnLib, rhnAction, \
rhnVirtualization
@@ -32,7 +32,6 @@ import server_lib
import server_token
from server_certificate import Certificate, gen_secret
from server_wrapper import ServerWrapper
-from satellite_cert import SatelliteCert
class Server(ServerWrapper):
""" Main Server class """
diff --git a/backend/server/rhnServer/server_lib.py
b/backend/server/rhnServer/server_lib.py
index 1d9ba71..63f1ab6 100644
--- a/backend/server/rhnServer/server_lib.py
+++ b/backend/server/rhnServer/server_lib.py
@@ -21,8 +21,7 @@ import time
import string
from spacewalk.common import rhnFault, rhnException, log_error, log_debug
-from spacewalk.common import CFG, rhnFlags
-from spacewalk.common.rhnTranslate import _
+from spacewalk.common import CFG
from spacewalk.server import rhnSQL
diff --git a/backend/server/rhnServer/server_packages.py
b/backend/server/rhnServer/server_packages.py
index 8c9ffc1..5dd3c55 100644
--- a/backend/server/rhnServer/server_packages.py
+++ b/backend/server/rhnServer/server_packages.py
@@ -19,10 +19,10 @@
import string
import time
-from types import DictType, TupleType
+from types import DictType
from spacewalk.common import log_debug, rhnFault, rhn_rpm
-from spacewalk.server import rhnSQL, rhnLib
+from spacewalk.server import rhnSQL
from server_lib import snapshot_server, check_entitlement
UNCHANGED = 0
diff --git a/backend/server/test/byterangetests.py
b/backend/server/test/byterangetests.py
index acfe6a6..9a45558 100644
--- a/backend/server/test/byterangetests.py
+++ b/backend/server/test/byterangetests.py
@@ -14,8 +14,6 @@
#
import unittest
-import common.byterange
-
class ByteRangeTests(unittest.TestCase):
def testEmptyRange(self):
diff --git a/backend/server/test/test_errata_import_webqa.py
b/backend/server/test/test_errata_import_webqa.py
index 6d0249d..e2fa6f0 100755
--- a/backend/server/test/test_errata_import_webqa.py
+++ b/backend/server/test/test_errata_import_webqa.py
@@ -14,7 +14,6 @@
# in this software or its documentation.
#
-import sys
import xmlrpclib
import unittest
diff --git a/backend/server/test/test_queue_get.py
b/backend/server/test/test_queue_get.py
index e32ab76..6be3841 100644
--- a/backend/server/test/test_queue_get.py
+++ b/backend/server/test/test_queue_get.py
@@ -13,7 +13,7 @@
# in this software or its documentation.
#
from spacewalk.server import rhnSQL
-from spacewalk.common import initCFG, rhnFlags, initLOG
+from spacewalk.common import initCFG, initLOG
from spacewalk.server.xmlrpc import queue
initLOG("stderr", 4)
commit 577f2ff1d6b01356740c021fb8117d7270033f68
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Nov 24 10:29:37 2010 +0100
removed unused imports
diff --git a/backend/server/rhnChannel.py b/backend/server/rhnChannel.py
index ba2e8a9..4fa1992 100644
--- a/backend/server/rhnChannel.py
+++ b/backend/server/rhnChannel.py
@@ -25,7 +25,6 @@ from types import IntType, ListType, DictType
from spacewalk.common import log_debug, log_error, rhnFault, rhnException, \
rhnCache, rhnFlags, CFG, rhn_rpm
from spacewalk.common.rhnTranslate import _
-from rhnDependency import MakeEvrError
# local module
import rhnUser, rhnSQL, rhnLib
diff --git a/backend/server/rhnImport.py b/backend/server/rhnImport.py
index 5cfc05c..bb0b712 100644
--- a/backend/server/rhnImport.py
+++ b/backend/server/rhnImport.py
@@ -18,7 +18,6 @@ import os
import sys
from spacewalk.common import log_debug, log_error
-from distutils.sysconfig import get_python_lib
class Loader:
# Class that saves the state of imported objects
diff --git a/backend/server/rhnLib.py b/backend/server/rhnLib.py
index b4b9147..a5f6584 100644
--- a/backend/server/rhnLib.py
+++ b/backend/server/rhnLib.py
@@ -16,7 +16,6 @@
import os
import re
import hashlib
-import time
import string
import base64
diff --git a/backend/server/rhnPackageUpload.py b/backend/server/rhnPackageUpload.py
index 28bc0ce..ab6e88e 100644
--- a/backend/server/rhnPackageUpload.py
+++ b/backend/server/rhnPackageUpload.py
@@ -17,9 +17,8 @@
import os
import tempfile
-from spacewalk.common import CFG, log_debug, rhnFault, UserDictCase, rhn_mpm, \
+from spacewalk.common import CFG, log_debug, rhnFault, rhn_mpm, \
rhn_deb
-from spacewalk.common.checksum import getFileChecksum
from spacewalk.common.rhn_rpm import get_header_byte_range
from spacewalk.server import rhnSQL
diff --git a/backend/server/rhnRepository.py b/backend/server/rhnRepository.py
index 6b92734..5162784 100644
--- a/backend/server/rhnRepository.py
+++ b/backend/server/rhnRepository.py
@@ -15,10 +15,8 @@
#
# system module imports
-import cStringIO
import os
import stat
-import types
from rhn import rpclib
diff --git a/backend/server/rhnSQL/dbi.py b/backend/server/rhnSQL/dbi.py
index c04c0bb..1b0a63c 100644
--- a/backend/server/rhnSQL/dbi.py
+++ b/backend/server/rhnSQL/dbi.py
@@ -14,8 +14,6 @@
#
#
-import sys
-
from const import ORACLE, POSTGRESQL
# Map supported backend constants to a specific Python driver:
diff --git a/backend/server/rhnSQL/sql_lib.py b/backend/server/rhnSQL/sql_lib.py
index 529d2ee..611932b 100644
--- a/backend/server/rhnSQL/sql_lib.py
+++ b/backend/server/rhnSQL/sql_lib.py
@@ -23,10 +23,6 @@
# $Id$
import string
-from types import IntType, ListType, TupleType, StringType
-
-from spacewalk.common import rhnFault, log_error, log_debug
-from spacewalk.common.rhnTranslate import _
################
## FUNCTIONS
commit 09443bb0c7c6d2c9f2e6024f18958557a026c7b6
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Nov 24 10:29:37 2010 +0100
removed unused import
diff --git a/backend/server/importlib/importLib.py
b/backend/server/importlib/importLib.py
index 52db04a..3b2f0a1 100644
--- a/backend/server/importlib/importLib.py
+++ b/backend/server/importlib/importLib.py
@@ -21,8 +21,6 @@ from types import IntType, StringType, InstanceType
from UserDict import UserDict
from UserList import UserList
-from spacewalk.server.rhnLib import get_package_path
-from spacewalk.common import rhn_mpm, log_debug
from spacewalk.common.checksum import getFileChecksum
from spacewalk.common.fileutils import createPath, setPermsPath
diff --git a/backend/server/importlib/kickstartImport.py
b/backend/server/importlib/kickstartImport.py
index a3f386e..8630d53 100644
--- a/backend/server/importlib/kickstartImport.py
+++ b/backend/server/importlib/kickstartImport.py
@@ -15,9 +15,9 @@
#
# Package import process
#
-import os.path
+
from importLib import KickstartableTree, Import
-from spacewalk.common import CFG
+
class KickstartableTreeImport(Import):
def __init__(self, batch, backend):
Import.__init__(self, batch, backend)
diff --git a/backend/server/importlib/packageImport.py
b/backend/server/importlib/packageImport.py
index 810107a..04fd3c4 100644
--- a/backend/server/importlib/packageImport.py
+++ b/backend/server/importlib/packageImport.py
@@ -17,12 +17,11 @@
#
import sys
-from importLib import GenericPackageImport, IncompletePackage, Package, \
+from importLib import GenericPackageImport, IncompletePackage, \
Import, InvalidArchError, InvalidChannelError, \
IncompatibleArchError
from spacewalk.server import taskomatic
from spacewalk.common import CFG
-from types import StringType
class ChannelPackageSubscription(GenericPackageImport):
def __init__(self, batch, backend, caller=None, strict=0, repogen=True):
diff --git a/backend/server/importlib/test/test_solaris.py
b/backend/server/importlib/test/test_solaris.py
index a1c6f34..453302b 100644
--- a/backend/server/importlib/test/test_solaris.py
+++ b/backend/server/importlib/test/test_solaris.py
@@ -13,8 +13,6 @@
# in this software or its documentation.
#
-import sys
-
from spacewalk.server import rhnSQL
from spacewalk.server.importlib.backendOracle import OracleBackend
from spacewalk.server.importlib.packageImport import PackageImport
diff --git a/backend/server/importlib/userAuth.py b/backend/server/importlib/userAuth.py
index 3e95f3b..406f4cf 100644
--- a/backend/server/importlib/userAuth.py
+++ b/backend/server/importlib/userAuth.py
@@ -16,7 +16,7 @@
# Authentication
#
-from spacewalk.common import CFG, rhnFault, log_debug, add_to_seclist
+from spacewalk.common import rhnFault, log_debug, add_to_seclist
from spacewalk.common.rhnTranslate import _
from spacewalk.server import rhnSQL, rhnUser