diff options
| -rw-r--r-- | contrib/packagekit.py | 1 | ||||
| -rw-r--r-- | func/CommonErrors.py | 2 | ||||
| -rw-r--r-- | func/SSLCommon.py | 1 | ||||
| -rw-r--r-- | func/SSLConnection.py | 4 | ||||
| -rwxr-xr-x | func/certmaster.py | 3 | ||||
| -rw-r--r-- | func/certs.py | 2 | ||||
| -rw-r--r-- | minion/AuthedXMLRPCServer.py | 5 | ||||
| -rwxr-xr-x | minion/server.py | 2 | ||||
| -rw-r--r-- | modules/command.py | 1 | ||||
| -rwxr-xr-x | modules/virt.py | 1 | ||||
| -rwxr-xr-x | overlord/client.py | 3 | ||||
| -rw-r--r-- | overlord/sslclient.py | 1 | ||||
| -rw-r--r-- | overlord/test_func.py | 1 | ||||
| -rw-r--r-- | setup.py | 5 |
14 files changed, 6 insertions, 26 deletions
diff --git a/contrib/packagekit.py b/contrib/packagekit.py index 60091c9..221fc5c 100644 --- a/contrib/packagekit.py +++ b/contrib/packagekit.py @@ -20,7 +20,6 @@ from modules import func_module from packagekit import PackageKit -import StringIO class PackageKitInterface(PackageKit): diff --git a/func/CommonErrors.py b/func/CommonErrors.py index 13ef505..fc4e049 100644 --- a/func/CommonErrors.py +++ b/func/CommonErrors.py @@ -14,8 +14,6 @@ # # Copyright 2005 Dan Williams <dcbw@redhat.com> and Red Hat, Inc. -import socket - def canIgnoreSSLError(e): """ diff --git a/func/SSLCommon.py b/func/SSLCommon.py index bdfd719..6959749 100644 --- a/func/SSLCommon.py +++ b/func/SSLCommon.py @@ -15,7 +15,6 @@ # Copyright 2005 Dan Williams <dcbw@redhat.com> and Red Hat, Inc. import os, sys -import CommonErrors from OpenSSL import SSL import SSLConnection import httplib diff --git a/func/SSLConnection.py b/func/SSLConnection.py index 47529b4..ff5ffa9 100644 --- a/func/SSLConnection.py +++ b/func/SSLConnection.py @@ -8,8 +8,8 @@ # Modifications by Dan Williams <dcbw@redhat.com> -from OpenSSL import SSL, crypto -import os, string, time, socket, select +from OpenSSL import SSL +import time, socket, select class SSLConnection: diff --git a/func/certmaster.py b/func/certmaster.py index 3ed6d58..ab0bc73 100755 --- a/func/certmaster.py +++ b/func/certmaster.py @@ -20,12 +20,9 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. # standard modules import SimpleXMLRPCServer -import string -import socket import sys import os import os.path -import traceback from OpenSSL import crypto import sha import glob diff --git a/func/certs.py b/func/certs.py index aafa58e..bf624a2 100644 --- a/func/certs.py +++ b/func/certs.py @@ -130,4 +130,4 @@ def create_slave_certificate(csr, cakey, cacert, cadir, slave_cert_file=None): destfo.write(crypto.dump_certificate(crypto.FILETYPE_PEM, cert)) destfo.close() return cert -
\ No newline at end of file + diff --git a/minion/AuthedXMLRPCServer.py b/minion/AuthedXMLRPCServer.py index 490b57a..da6b18a 100644 --- a/minion/AuthedXMLRPCServer.py +++ b/minion/AuthedXMLRPCServer.py @@ -15,11 +15,8 @@ # Copyright 2005 Dan Williams <dcbw@redhat.com> and Red Hat, Inc. # Modifications by Seth Vidal - 2007 -import os, sys +import sys import socket -import time -import SocketServer -import xmlrpclib import SimpleXMLRPCServer from func import SSLCommon import OpenSSL diff --git a/minion/server.py b/minion/server.py index 302bf43..b10eedb 100755 --- a/minion/server.py +++ b/minion/server.py @@ -21,7 +21,7 @@ import sys import traceback import socket -from rhpl.translate import _, N_, textdomain, utf8 +from rhpl.translate import textdomain I18N_DOMAIN = "func" # our modules diff --git a/modules/command.py b/modules/command.py index 7a0f825..d862199 100644 --- a/modules/command.py +++ b/modules/command.py @@ -15,7 +15,6 @@ Abitrary command execution module for func. from modules import func_module import sub_process -import os class Command(func_module.FuncModule): diff --git a/modules/virt.py b/modules/virt.py index 15be92c..300ec89 100755 --- a/modules/virt.py +++ b/modules/virt.py @@ -20,7 +20,6 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. # to use this to come. # other modules -import sys import os import sub_process import libvirt diff --git a/overlord/client.py b/overlord/client.py index c4b9fa4..cf7a375 100755 --- a/overlord/client.py +++ b/overlord/client.py @@ -17,10 +17,7 @@ import optparse import sys -import xmlrpclib -import traceback import glob -import os import sslclient diff --git a/overlord/sslclient.py b/overlord/sslclient.py index 928d6bb..463b8c6 100644 --- a/overlord/sslclient.py +++ b/overlord/sslclient.py @@ -1,6 +1,5 @@ #!/usr/bin/python -import os import sys import xmlrpclib import urllib diff --git a/overlord/test_func.py b/overlord/test_func.py index f3b1652..59e92a0 100644 --- a/overlord/test_func.py +++ b/overlord/test_func.py @@ -5,7 +5,6 @@ import xmlrpclib import sys -import socket TEST_GETATTR = True TEST_PROCESS = False @@ -1,10 +1,7 @@ #!/usr/bin/python -import sys -from distutils.core import setup, Extension +from distutils.core import setup #from setuptools import setup,find_packages -import string -import glob NAME = "func" VERSION = open("version", "r+").read().split()[0] |