Exception cleanup

svn path=/scripts/biz-certs/Bob-CA.srl; revision=1327

1 files changed, 6 insertions, 6 deletions

diff --git a/scripts/rpki/left_right.py b/scripts/rpki/left_right.py
index ac77342f..e014c823 100644
--- a/scripts/rpki/left_right.py
+++ b/scripts/rpki/left_right.py
@@ -244,7 +244,7 @@ class self_elt(data_elt):
   def serve_post_save_hook(self, q_pdu, r_pdu):
     """Extra server actions for self_elt."""
     if self.rekey or self.reissue or self.revoke or self.run_now or self.publish_world_now:
-      raise NotImplementedError, "Unimplemented control %s" % ", ".join(
+      raise rpki.exceptions.NotImplementedYet, "Unimplemented control %s" % ", ".join(
         b for b in ("rekey", "reissue", "revoke", "run_now", "publish_world_now") if getattr(self, b))
 
   def serve_fetch_one(self, gctx):
@@ -482,7 +482,7 @@ class parent_elt(data_elt):
   def serve_post_save_hook(self, q_pdu, r_pdu):
     """Extra server actions for parent_elt."""
     if self.rekey or self.reissue or self.revoke:
-      raise NotImplementedError, "Unimplemented control %s" % ", ".join(
+      raise rpki.exceptions.NotImplementedYet, "Unimplemented control %s" % ", ".join(
         b for b in ("rekey","reissue","revoke") if getattr(self, b))
 
   def startElement(self, stack, name, attrs):
@@ -575,8 +575,8 @@ class child_elt(data_elt):
   def serve_post_save_hook(self, q_pdu, r_pdu):
     """Extra server actions for child_elt."""
     if self.reissue:
-      raise NotImplementedError, \
-            "Unimplemented control %s" % ", ".join(b for b in ("reissue",) if getattr(self, b))
+      raise rpki.exceptions.NotImplementedYet, "Unimplemented control %s" % ", ".join(
+        b for b in ("reissue",) if getattr(self, b))
 
   def startElement(self, stack, name, attrs):
     """Handle <child/> element."""
@@ -752,8 +752,8 @@ class route_origin_elt(data_elt):
   def serve_post_save_hook(self, q_pdu, r_pdu):
     """Extra server actions for route_origin_elt."""
     if self.suppress_publication:
-      raise NotImplementedError, \
-            "Unimplemented control %s" % ", ".join(b for b in ("suppress_publication",) if getattr(self, b))
+      raise rpki.exceptions.NotImplementedYet, "Unimplemented control %s" % ", ".join(
+        b for b in ("suppress_publication",) if getattr(self, b))
 
   def startElement(self, stack, name, attrs):
     """Handle <route_origin/> element."""