diff options
| author | Rob Austein <sra@hactrn.net> | 2014-05-29 19:33:43 +0000 |
|---|---|---|
| committer | Rob Austein <sra@hactrn.net> | 2014-05-29 19:33:43 +0000 |
| commit | 07a045d1259f30878abba416b86373c05c929965 (patch) | |
| tree | 9b8e4fe0038e4891e3b262168dce5ecfdccc36f7 /rpki/xml_utils.py | |
| parent | e6047c9f737275d898d88737719dd09a6ee4f25c (diff) | |
Python style police: instantiate exceptions before raising them
(convert two-expression form of "raise" to one-expression form).
svn path=/trunk/; revision=5844
Diffstat (limited to 'rpki/xml_utils.py')
| -rw-r--r-- | rpki/xml_utils.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/rpki/xml_utils.py b/rpki/xml_utils.py index f254fd11..54cfac6d 100644 --- a/rpki/xml_utils.py +++ b/rpki/xml_utils.py @@ -339,8 +339,8 @@ class data_elt(base_elt): oops = self.serve_fetch_one_maybe() if oops is not None: - raise rpki.exceptions.DuplicateObject, "Object already exists: %r[%r] %r[%r]" % (self, getattr(self, self.element_name + "_handle"), - oops, getattr(oops, oops.element_name + "_handle")) + raise rpki.exceptions.DuplicateObject("Object already exists: %r[%r] %r[%r]" % (self, getattr(self, self.element_name + "_handle"), + oops, getattr(oops, oops.element_name + "_handle"))) self.serve_pre_save_hook(self, r_pdu, one, eb) @@ -412,7 +412,7 @@ class data_elt(base_elt): "list" : self.serve_list, "destroy" : self.serve_destroy } if self.action not in dispatch: - raise rpki.exceptions.BadQuery, "Unexpected query: action %s" % self.action + raise rpki.exceptions.BadQuery("Unexpected query: action %s" % self.action) dispatch[self.action](r_msg, cb, eb) def unimplemented_control(self, *controls): @@ -421,7 +421,7 @@ class data_elt(base_elt): """ unimplemented = [x for x in controls if getattr(self, x, False)] if unimplemented: - raise rpki.exceptions.NotImplementedYet, "Unimplemented control %s" % ", ".join(unimplemented) + raise rpki.exceptions.NotImplementedYet("Unimplemented control %s" % ", ".join(unimplemented)) class msg(list): """ |