3 files changed, 33 insertions, 24 deletions
diff --git a/rpkid/rpki/left_right.py b/rpkid/rpki/left_right.py
index acb49e49..2d28c950 100644
--- a/rpkid/rpki/left_right.py
+++ b/rpkid/rpki/left_right.py
@@ -42,7 +42,6 @@ import rpki.up_down
 import rpki.relaxng
 import rpki.sundial
 import rpki.log
-import rpki.roa
 import rpki.publication
 import rpki.async
 import rpki.rpkid_tasks
diff --git a/rpkid/rpki/publication.py b/rpkid/rpki/publication.py
index 69086dfe..8c50aeee 100644
--- a/rpkid/rpki/publication.py
+++ b/rpkid/rpki/publication.py
@@ -3,7 +3,7 @@ RPKI "publication" protocol.
 
 $Id$
 
-Copyright (C) 2009--2011  Internet Systems Consortium ("ISC")
+Copyright (C) 2009--2012  Internet Systems Consortium ("ISC")
 
 Permission to use, copy, modify, and distribute this software for any
 purpose with or without fee is hereby granted, provided that the above
@@ -32,9 +32,18 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 PERFORMANCE OF THIS SOFTWARE.
 """
 
-import os, errno
-import rpki.resource_set, rpki.x509, rpki.sql, rpki.exceptions, rpki.xml_utils
-import rpki.http, rpki.up_down, rpki.relaxng, rpki.sundial, rpki.log, rpki.roa
+import os
+import errno
+import rpki.resource_set
+import rpki.x509
+import rpki.sql
+import rpki.exceptions
+import rpki.xml_utils
+import rpki.http
+import rpki.up_down
+import rpki.relaxng
+import rpki.sundial
+import rpki.log
 
 class publication_namespace(object):
   """
diff --git a/rpkid/rpki/x509.py b/rpkid/rpki/x509.py
index b3132b9b..2ef60b17 100644
--- a/rpkid/rpki/x509.py
+++ b/rpkid/rpki/x509.py
@@ -43,10 +43,26 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 PERFORMANCE OF THIS SOFTWARE.
 """
 
-import rpki.POW, rpki.POW.pkix, base64, lxml.etree, os, subprocess, sys
-import email.mime.application, email.utils, mailbox, time
-import rpki.exceptions, rpki.resource_set, rpki.oids, rpki.sundial
-import rpki.manifest, rpki.roa, rpki.log, rpki.async, rpki.ghostbuster
+import rpki.POW
+import rpki.POW.pkix
+import base64
+import lxml.etree
+import os
+import subprocess
+import sys
+import email.mime.application
+import email.utils
+import mailbox
+import time
+import rpki.exceptions
+import rpki.resource_set
+import rpki.oids
+import rpki.sundial
+import rpki.manifest
+import rpki.roa
+import rpki.log
+import rpki.async
+import rpki.ghostbuster
 import rpki.relaxng
 
 def base64_with_linebreaks(der):
@@ -1550,21 +1566,6 @@ class ROA(DER_CMS_object):
       pass
     return msg
 
-class Ghostbuster(DER_CMS_object):
-  """
-  Class to hold a signed Ghostbuster record.
-  """
-
-  content_class = rpki.ghostbuster.Ghostbuster
-
-  @classmethod
-  def build(cls, vcard, keypair, certs):
-      self = cls()
-      gbr = content_class(vcard)
-      self.set_content(gbr)
-      self.sign(keypair, certs)
-      return self
-
 class DeadDrop(object):
   """
   Dead-drop utility for storing copies of CMS messages for debugging or