Refactor publication code, step 1: clean up

rpki.left_right.repository_elt.call_pubd() and methods in
rpki.xmlutils.msg class that were (mis)designed to fit.

svn path=/myrpki/myirbe.py; revision=2836

2 files changed, 6 insertions, 6 deletions

diff --git a/rpkid/rpki/left_right.py b/rpkid/rpki/left_right.py
index da7247b7..d8a8f633 100644
--- a/rpkid/rpki/left_right.py
+++ b/rpkid/rpki/left_right.py
@@ -652,8 +652,8 @@ class repository_elt(data_elt):
       errback(e)
     rpki.log.trace()
     rpki.log.info("Publishing %r as %r" % (obj, uri))
-    q_msg = rpki.publication.msg.query()
-    q_msg.append(rpki.publication.publication_object_elt.make_publish(uri = uri, obj = obj))
+    q_msg = rpki.publication.msg.query(
+      rpki.publication.publication_object_elt.make_publish(uri = uri, obj = obj))
     self.call_pubd(callback, fail, q_msg)
 
   def withdraw(self, obj, uri, callback, errback, allow_failure = False):
@@ -668,8 +668,8 @@ class repository_elt(data_elt):
         errback(e)
     rpki.log.trace()
     rpki.log.info("Withdrawing %r from %r" % (obj, uri))
-    q_msg = rpki.publication.msg.query()
-    q_msg.append(rpki.publication.publication_object_elt.make_withdraw(uri = uri, obj = obj))
+    q_msg = rpki.publication.msg.query(
+      rpki.publication.publication_object_elt.make_withdraw(uri = uri, obj = obj))
     self.call_pubd(callback, fail, q_msg)
 
 class parent_elt(data_elt):
diff --git a/rpkid/rpki/xml_utils.py b/rpkid/rpki/xml_utils.py
index e3b9a7f0..274eeea0 100644
--- a/rpkid/rpki/xml_utils.py
+++ b/rpkid/rpki/xml_utils.py
@@ -454,14 +454,14 @@ class msg(list):
   @classmethod
   def query(cls, *args):
     """Create a query PDU."""
-    self = cls(*args)
+    self = cls(args)
     self.type = "query"
     return self
 
   @classmethod
   def reply(cls, *args):
     """Create a reply PDU."""
-    self = cls(*args)
+    self = cls(args)
     self.type = "reply"
     return self