Checkpoint

svn path=/rpkid/rpki/publication.py; revision=1816

2 files changed, 9 insertions, 9 deletions

diff --git a/rpkid/rpki/pubproto.py b/rpkid/rpki/publication.py
index 39373f5a..719dfdbd 100644
--- a/rpkid/rpki/pubproto.py
+++ b/rpkid/rpki/publication.py
@@ -28,8 +28,8 @@ import rpki.resource_set, rpki.x509, rpki.sql, rpki.exceptions, rpki.sax_utils
 import rpki.https, rpki.up_down, rpki.relaxng, rpki.sundial, rpki.log, rpki.roa
 import rpki.left_right
 
-pubproto_xmlns = "http://www.hactrn.net/uris/rpki/publication-spec/"
-pubproto_nsmap = { None : pubproto_xmlns }
+publication_xmlns = "http://www.hactrn.net/uris/rpki/publication-spec/"
+publication_nsmap = { None : publication_xmlns }
 
 class data_elt(rpki.left_right.base_elt):
   """Virtual class for top-level publication protocol data elements.
@@ -39,8 +39,8 @@ class data_elt(rpki.left_right.base_elt):
   rpki.left_right, but wait and see.
   """
 
-  xmlns = pubproto_xmlns
-  nsmap = pubproto_nsmap
+  xmlns = publication_xmlns
+  nsmap = publication_nsmap
 
 class client_elt(data_elt):
   """<client/> element."""
@@ -90,8 +90,8 @@ class report_error_elt(rpki.left_right.report_error_elt):
 class msg(rpki.left_right.msg):
   """Publication PDU."""
 
-  xmlns = pubproto_xmlns
-  nsmap = pubproto_nsmap
+  xmlns = publication_xmlns
+  nsmap = publication_nsmap
 
   ## @var version
   # Protocol version
diff --git a/rpkid/xml-parse-test.py b/rpkid/xml-parse-test.py
index e8747f65..66abf967 100755
--- a/rpkid/xml-parse-test.py
+++ b/rpkid/xml-parse-test.py
@@ -15,7 +15,7 @@
 # PERFORMANCE OF THIS SOFTWARE.
 
 import glob, xml.sax, lxml.etree, lxml.sax, POW, POW.pkix
-import rpki.up_down, rpki.left_right, rpki.pubproto, rpki.relaxng
+import rpki.up_down, rpki.left_right, rpki.publication, rpki.relaxng
 
 verbose = True
 
@@ -74,7 +74,7 @@ def lr_tester(elt_in, elt_out, msg):
               (obj.bpki_glue,         "Glue")))
 
 def pp_tester(elt_in, elt_out, msg):
-  assert isinstance(msg, rpki.pubproto.msg)
+  assert isinstance(msg, rpki.publication.msg)
 
 test(fileglob = "up-down-protocol-samples/*.xml",
      rng = rpki.relaxng.up_down,
@@ -90,6 +90,6 @@ test(fileglob = "left-right-protocol-samples/*.xml",
 
 test(fileglob = "publication-protocol-samples/*.xml",
      rng = rpki.relaxng.publication,
-     sax_handler = rpki.pubproto.sax_handler,
+     sax_handler = rpki.publication.sax_handler,
      encoding = "us-ascii",
      tester = pp_tester)