summaryrefslogtreecommitdiffstats
path: root/func
diff options
context:
space:
mode:
authorJames Bowes <jbowes@redhat.com>2007-09-26 22:36:33 -0400
committerJames Bowes <jbowes@redhat.com>2007-09-26 22:36:33 -0400
commit00179513a9585eeeaee12c644a35f14f8ecc3862 (patch)
treed7324872ca76f9525184f8547f4de9f70432a862 /func
parent7cacf5f3114fb8d7dabd91dd3acc9f95c657442f (diff)
downloadthird_party-func-00179513a9585eeeaee12c644a35f14f8ecc3862.tar.gz
third_party-func-00179513a9585eeeaee12c644a35f14f8ecc3862.tar.xz
third_party-func-00179513a9585eeeaee12c644a35f14f8ecc3862.zip
Remove assorted unused imports
Diffstat (limited to 'func')
-rw-r--r--func/CommonErrors.py2
-rw-r--r--func/SSLCommon.py1
-rw-r--r--func/SSLConnection.py4
-rwxr-xr-xfunc/certmaster.py3
-rw-r--r--func/certs.py2
5 files changed, 3 insertions, 9 deletions
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
+