Pull changes from trunk.

svn path=/branches/tk705/; revision=5903

1 files changed, 4 insertions, 5 deletions

diff --git a/rpki/up_down.py b/rpki/up_down.py
index df45c8c2..9fb627a1 100644
--- a/rpki/up_down.py
+++ b/rpki/up_down.py
@@ -33,9 +33,8 @@ import rpki.relaxng
 
 logger = logging.getLogger(__name__)
 
-xmlns = "http://www.apnic.net/specs/rescerts/up-down/"
-
-nsmap = { None : xmlns }
+xmlns = rpki.relaxng.up_down.xmlns
+nsmap = rpki.relaxng.up_down.nsmap
 
 class base_elt(object):
   """
@@ -68,7 +67,7 @@ class base_elt(object):
     Construct a element, copying over a set of attributes.
     """
 
-    elt = lxml.etree.Element("{%s}%s" % (xmlns, name), nsmap=nsmap)
+    elt = lxml.etree.Element(xmlns + name, nsmap = nsmap)
     for key in attrs:
       val = getattr(self, key, None)
       if val is not None:
@@ -81,7 +80,7 @@ class base_elt(object):
     """
 
     if value is not None and not value.empty():
-      lxml.etree.SubElement(elt, "{%s}%s" % (xmlns, name), nsmap=nsmap).text = value.get_Base64()
+      lxml.etree.SubElement(elt, xmlns + name, nsmap = nsmap).text = value.get_Base64()
 
   def serve_pdu(self, q_msg, r_msg, child, callback, errback):
     """