In some cases pylint doesn't parse the import correctly, so we add silences; but there are also many cases of unused imports, which we simply remove. --- daemons/ganeti-confd | 1 - daemons/ganeti-noded | 3 +-- daemons/ganeti-rapi | 6 +----- daemons/ganeti-watcher | 1 - lib/confd/client.py | 1 - lib/http/server.py | 1 - lib/hypervisor/hv_chroot.py | 3 +-- lib/hypervisor/hv_xen.py | 2 -- scripts/gnt-backup | 2 -- scripts/gnt-debug | 1 - scripts/gnt-instance | 1 - scripts/gnt-node | 1 - scripts/gnt-os | 1 - tools/cfgupgrade | 1 - 14 files changed, 3 insertions(+), 22 deletions(-)
diff --git a/daemons/ganeti-confd b/daemons/ganeti-confd index df577f1..b7198d0 100755 --- a/daemons/ganeti-confd +++ b/daemons/ganeti-confd @@ -48,7 +48,6 @@ from ganeti.confd import server as confd_server from ganeti import constants from ganeti import errors from ganeti import daemon -from ganeti import ssconf class ConfdAsyncUDPServer(daemon.AsyncUDPSocket): diff --git a/daemons/ganeti-noded b/daemons/ganeti-noded index 7a17e4f..fce0d29 100755 --- a/daemons/ganeti-noded +++ b/daemons/ganeti-noded @@ -31,7 +31,6 @@ import os import sys -import SocketServer import logging import signal @@ -47,7 +46,7 @@ from ganeti import http from ganeti import utils from ganeti import storage -import ganeti.http.server +import ganeti.http.server # pylint: disable-msg=W0611 queue_lock = None diff --git a/daemons/ganeti-rapi b/daemons/ganeti-rapi index adbff4c..8ef9365 100755 --- a/daemons/ganeti-rapi +++ b/daemons/ganeti-rapi @@ -26,25 +26,21 @@ # C0103: Invalid name ganeti-watcher -import glob import logging import optparse import sys import os import os.path -import signal from ganeti import constants -from ganeti import errors from ganeti import http from ganeti import daemon from ganeti import ssconf -from ganeti import utils from ganeti import luxi from ganeti import serializer from ganeti.rapi import connector -import ganeti.http.auth +import ganeti.http.auth # pylint: disable-msg=W0611 import ganeti.http.server diff --git a/daemons/ganeti-watcher b/daemons/ganeti-watcher index 6c97d40..6346f07 100755 --- a/daemons/ganeti-watcher +++ b/daemons/ganeti-watcher @@ -35,7 +35,6 @@ import os import sys import time import logging -import errno from optparse import OptionParser from ganeti import utils diff --git a/lib/confd/client.py b/lib/confd/client.py index e2d1a8b..e328868 100644 --- a/lib/confd/client.py +++ b/lib/confd/client.py @@ -50,7 +50,6 @@ confirming what you already got. # E0203: Access to member %r before its definition, since we use # objects.py which doesn't explicitely initialise its members -import socket import time import random diff --git a/lib/http/server.py b/lib/http/server.py index ba5cc97..c49cb4b 100644 --- a/lib/http/server.py +++ b/lib/http/server.py @@ -26,7 +26,6 @@ import BaseHTTPServer import cgi import logging import os -import select import socket import time import signal diff --git a/lib/hypervisor/hv_chroot.py b/lib/hypervisor/hv_chroot.py index e30ddf1..b624ec3 100644 --- a/lib/hypervisor/hv_chroot.py +++ b/lib/hypervisor/hv_chroot.py @@ -27,10 +27,9 @@ import os import os.path import time import logging -from cStringIO import StringIO from ganeti import constants -from ganeti import errors +from ganeti import errors # pylint: disable-msg=W0611 from ganeti import utils from ganeti.hypervisor import hv_base from ganeti.errors import HypervisorError diff --git a/lib/hypervisor/hv_xen.py b/lib/hypervisor/hv_xen.py index 99bffd7..2eb2cc5 100644 --- a/lib/hypervisor/hv_xen.py +++ b/lib/hypervisor/hv_xen.py @@ -23,8 +23,6 @@ """ -import os -import os.path import logging from cStringIO import StringIO diff --git a/scripts/gnt-backup b/scripts/gnt-backup index 6593aa5..fd04a92 100755 --- a/scripts/gnt-backup +++ b/scripts/gnt-backup @@ -31,8 +31,6 @@ import sys from ganeti.cli import * from ganeti import opcodes from ganeti import constants -from ganeti import errors -from ganeti import utils _VALUE_TRUE = "true" diff --git a/scripts/gnt-debug b/scripts/gnt-debug index 475ccb7..6c9d5b7 100755 --- a/scripts/gnt-debug +++ b/scripts/gnt-debug @@ -32,7 +32,6 @@ import time from ganeti.cli import * from ganeti import cli from ganeti import opcodes -from ganeti import constants from ganeti import utils from ganeti import errors diff --git a/scripts/gnt-instance b/scripts/gnt-instance index ec08c0d..56eb510 100755 --- a/scripts/gnt-instance +++ b/scripts/gnt-instance @@ -29,7 +29,6 @@ import sys import os import itertools import simplejson -import time from cStringIO import StringIO from ganeti.cli import * diff --git a/scripts/gnt-node b/scripts/gnt-node index f2a13ff..f1cde4f 100755 --- a/scripts/gnt-node +++ b/scripts/gnt-node @@ -29,7 +29,6 @@ import sys from ganeti.cli import * -from ganeti import cli from ganeti import opcodes from ganeti import utils from ganeti import constants diff --git a/scripts/gnt-os b/scripts/gnt-os index 53304e2..dd916ac 100755 --- a/scripts/gnt-os +++ b/scripts/gnt-os @@ -31,7 +31,6 @@ import sys from ganeti.cli import * from ganeti import opcodes from ganeti import utils -from ganeti import constants def ListOS(opts, args): diff --git a/tools/cfgupgrade b/tools/cfgupgrade index 5755505..e7be591 100755 --- a/tools/cfgupgrade +++ b/tools/cfgupgrade @@ -32,7 +32,6 @@ import os.path import sys import optparse import logging -import errno from ganeti import constants from ganeti import serializer -- 1.6.5.7
