From 6282eb1e970180fd5c786cdd523fddbc9c683ac2 Mon Sep 17 00:00:00 2001 From: Serhii Skrypnik Date: Mon, 19 Sep 2022 17:30:39 +0300 Subject: [PATCH] Raise proper exceptions in python generators --- .../fprime_ac/generators/AbstractGenerator.py | 6 ++--- .../src/fprime_ac/generators/ChannelBody.py | 4 ++-- .../src/fprime_ac/generators/ChannelHeader.py | 4 ++-- .../src/fprime_ac/generators/CommandBody.py | 4 ++-- .../src/fprime_ac/generators/CommandHeader.py | 4 ++-- .../src/fprime_ac/generators/DictBody.py | 4 ++-- .../src/fprime_ac/generators/DictHeader.py | 4 ++-- .../src/fprime_ac/generators/DictStart.py | 4 ++-- .../src/fprime_ac/generators/EventBody.py | 4 ++-- .../src/fprime_ac/generators/EventHeader.py | 4 ++-- .../src/fprime_ac/generators/FinishSource.py | 4 ++-- .../src/fprime_ac/generators/HtmlDocPage.py | 4 ++-- .../src/fprime_ac/generators/HtmlStartPage.py | 4 ++-- .../src/fprime_ac/generators/Includes1.py | 4 ++-- .../src/fprime_ac/generators/Includes2.py | 4 ++-- .../src/fprime_ac/generators/InitFiles.py | 4 ++-- .../fprime_ac/generators/InstanceDictBody.py | 4 ++-- .../generators/InstanceDictHeader.py | 4 ++-- .../fprime_ac/generators/InstanceDictStart.py | 4 ++-- .../src/fprime_ac/generators/MdDocPage.py | 4 ++-- .../src/fprime_ac/generators/MdStartPage.py | 4 ++-- .../src/fprime_ac/generators/Namespace.py | 4 ++-- .../src/fprime_ac/generators/Private.py | 4 ++-- .../src/fprime_ac/generators/Protected.py | 4 ++-- .../Python/src/fprime_ac/generators/Public.py | 4 ++-- .../src/fprime_ac/generators/StartChannel.py | 4 ++-- .../src/fprime_ac/generators/StartCommand.py | 4 ++-- .../src/fprime_ac/generators/StartEvent.py | 4 ++-- .../src/fprime_ac/generators/StartSource.py | 4 ++-- .../src/fprime_ac/generators/formatters.py | 8 +++---- .../generators/visitors/AbstractVisitor.py | 24 +++++++++---------- .../generators/visitors/CommandVisitor.py | 2 +- .../visitors/InstanceChannelVisitor.py | 2 +- .../visitors/InstanceEventVisitor.py | 2 +- 34 files changed, 78 insertions(+), 78 deletions(-) diff --git a/Autocoders/Python/src/fprime_ac/generators/AbstractGenerator.py b/Autocoders/Python/src/fprime_ac/generators/AbstractGenerator.py index dc4e0560ea..de18671938 100644 --- a/Autocoders/Python/src/fprime_ac/generators/AbstractGenerator.py +++ b/Autocoders/Python/src/fprime_ac/generators/AbstractGenerator.py @@ -57,7 +57,7 @@ def __call__(self, args): Main execution point. Calls the accept method on each visitor to generate the code. """ - raise Exception( + raise NotImplementedError( "AbstractGenerator.__call__() - Implementation Error: you must supply your own concrete implementation." ) @@ -65,7 +65,7 @@ def accept(self, visitor): """ Execute the visit call on this object. """ - raise Exception( + raise NotImplementedError( "AbstractFace.accept.accept(v) - Implementation Error: you must supply your own concrete implementation." ) @@ -73,6 +73,6 @@ def addVisitor(self, visitor): """ Method to add the visitor to a list of visitors. """ - raise Exception( + raise NotImplementedError( "AbstractFace.accept.addVisitor(v) - Implementation Error: you must supply your own concrete implementation." ) diff --git a/Autocoders/Python/src/fprime_ac/generators/ChannelBody.py b/Autocoders/Python/src/fprime_ac/generators/ChannelBody.py index c84a65f632..4471c0e78b 100644 --- a/Autocoders/Python/src/fprime_ac/generators/ChannelBody.py +++ b/Autocoders/Python/src/fprime_ac/generators/ChannelBody.py @@ -79,7 +79,7 @@ def accept(self, visitor): DEBUG.error( "ChannelBody.accept() - the given visitor is not a subclass of AbstractVisitor!" ) - raise Exception( + raise TypeError( "ChannelBody.accept() - the given visitor is not a subclass of AbstractVisitor!" ) @@ -94,7 +94,7 @@ def addVisitor(self, visitor): DEBUG.error( "ChannelBody.addVisitor(v) - the given visitor is not a subclass of AbstractVisitor!" ) - raise Exception( + raise TypeError( "ChannelBody.addVisitor(v) - the given visitor is not a subclass of AbstractVisitor!" ) diff --git a/Autocoders/Python/src/fprime_ac/generators/ChannelHeader.py b/Autocoders/Python/src/fprime_ac/generators/ChannelHeader.py index 73c8b33eac..c2fe6a60e5 100644 --- a/Autocoders/Python/src/fprime_ac/generators/ChannelHeader.py +++ b/Autocoders/Python/src/fprime_ac/generators/ChannelHeader.py @@ -79,7 +79,7 @@ def accept(self, visitor): DEBUG.error( "ChannelHeader.accept() - the given visitor is not a subclass of AbstractVisitor!" ) - raise Exception( + raise TypeError( "ChannelHeader.accept() - the given visitor is not a subclass of AbstractVisitor!" ) @@ -94,7 +94,7 @@ def addVisitor(self, visitor): DEBUG.error( "ChannelHeader.addVisitor(v) - the given visitor is not a subclass of AbstractVisitor!" ) - raise Exception( + raise TypeError( "ChannelHeader.addVisitor(v) - the given visitor is not a subclass of AbstractVisitor!" ) diff --git a/Autocoders/Python/src/fprime_ac/generators/CommandBody.py b/Autocoders/Python/src/fprime_ac/generators/CommandBody.py index f37b5c57f1..35c81bf8ac 100644 --- a/Autocoders/Python/src/fprime_ac/generators/CommandBody.py +++ b/Autocoders/Python/src/fprime_ac/generators/CommandBody.py @@ -79,7 +79,7 @@ def accept(self, visitor): DEBUG.error( "startCommandVisit.accept() - the given visitor is not a subclass of AbstractVisitor!" ) - raise Exception( + raise TypeError( "startCommandVisit.accept() - the given visitor is not a subclass of AbstractVisitor!" ) @@ -94,7 +94,7 @@ def addVisitor(self, visitor): DEBUG.error( "startCommandVisit.addVisitor(v) - the given visitor is not a subclass of AbstractVisitor!" ) - raise Exception( + raise TypeError( "startCommandVisit.addVisitor(v) - the given visitor is not a subclass of AbstractVisitor!" ) diff --git a/Autocoders/Python/src/fprime_ac/generators/CommandHeader.py b/Autocoders/Python/src/fprime_ac/generators/CommandHeader.py index cadd440263..66bc1f29c7 100644 --- a/Autocoders/Python/src/fprime_ac/generators/CommandHeader.py +++ b/Autocoders/Python/src/fprime_ac/generators/CommandHeader.py @@ -79,7 +79,7 @@ def accept(self, visitor): DEBUG.error( "CommandHeader.accept() - the given visitor is not a subclass of AbstractVisitor!" ) - raise Exception( + raise TypeError( "CommandHeader.accept() - the given visitor is not a subclass of AbstractVisitor!" ) @@ -94,7 +94,7 @@ def addVisitor(self, visitor): DEBUG.error( "CommandHeader.addVisitor(v) - the given visitor is not a subclass of AbstractVisitor!" ) - raise Exception( + raise TypeError( "CommandHeader.addVisitor(v) - the given visitor is not a subclass of AbstractVisitor!" ) diff --git a/Autocoders/Python/src/fprime_ac/generators/DictBody.py b/Autocoders/Python/src/fprime_ac/generators/DictBody.py index bc81dc69f4..a9410f7231 100644 --- a/Autocoders/Python/src/fprime_ac/generators/DictBody.py +++ b/Autocoders/Python/src/fprime_ac/generators/DictBody.py @@ -79,7 +79,7 @@ def accept(self, visitor): DEBUG.error( "DictBodyVisit.accept() - the given visitor is not a subclass of AbstractVisitor!" ) - raise Exception( + raise TypeError( "DictBodyVisit.accept() - the given visitor is not a subclass of AbstractVisitor!" ) @@ -94,7 +94,7 @@ def addVisitor(self, visitor): DEBUG.error( "DictBodyVisit.addVisitor(v) - the given visitor is not a subclass of AbstractVisitor!" ) - raise Exception( + raise TypeError( "DictBodyVisit.addVisitor(v) - the given visitor is not a subclass of AbstractVisitor!" ) diff --git a/Autocoders/Python/src/fprime_ac/generators/DictHeader.py b/Autocoders/Python/src/fprime_ac/generators/DictHeader.py index 1727cb3d74..658a23d3dd 100644 --- a/Autocoders/Python/src/fprime_ac/generators/DictHeader.py +++ b/Autocoders/Python/src/fprime_ac/generators/DictHeader.py @@ -79,7 +79,7 @@ def accept(self, visitor): DEBUG.error( "DictHeaderVisit.accept() - the given visitor is not a subclass of AbstractVisitor!" ) - raise Exception( + raise TypeError( "DictHeaderVisit.accept() - the given visitor is not a subclass of AbstractVisitor!" ) @@ -94,7 +94,7 @@ def addVisitor(self, visitor): DEBUG.error( "DictHeaderVisit.addVisitor(v) - the given visitor is not a subclass of AbstractVisitor!" ) - raise Exception( + raise TypeError( "DictHeaderVisit.addVisitor(v) - the given visitor is not a subclass of AbstractVisitor!" ) diff --git a/Autocoders/Python/src/fprime_ac/generators/DictStart.py b/Autocoders/Python/src/fprime_ac/generators/DictStart.py index 6cb18a921b..5df92a6bb0 100644 --- a/Autocoders/Python/src/fprime_ac/generators/DictStart.py +++ b/Autocoders/Python/src/fprime_ac/generators/DictStart.py @@ -79,7 +79,7 @@ def accept(self, visitor): DEBUG.error( "DictStartVisit.accept() - the given visitor is not a subclass of AbstractVisitor!" ) - raise Exception( + raise TypeError( "DictStartVisit.accept() - the given visitor is not a subclass of AbstractVisitor!" ) @@ -94,7 +94,7 @@ def addVisitor(self, visitor): DEBUG.error( "DictStartVisit.addVisitor(v) - the given visitor is not a subclass of AbstractVisitor!" ) - raise Exception( + raise TypeError( "DictStartVisit.addVisitor(v) - the given visitor is not a subclass of AbstractVisitor!" ) diff --git a/Autocoders/Python/src/fprime_ac/generators/EventBody.py b/Autocoders/Python/src/fprime_ac/generators/EventBody.py index 847ffa4547..99eca93ac5 100644 --- a/Autocoders/Python/src/fprime_ac/generators/EventBody.py +++ b/Autocoders/Python/src/fprime_ac/generators/EventBody.py @@ -79,7 +79,7 @@ def accept(self, visitor): DEBUG.error( "EventBody.accept() - the given visitor is not a subclass of AbstractVisitor!" ) - raise Exception( + raise TypeError( "EventBody.accept() - the given visitor is not a subclass of AbstractVisitor!" ) @@ -94,7 +94,7 @@ def addVisitor(self, visitor): DEBUG.error( "EventBody.addVisitor(v) - the given visitor is not a subclass of AbstractVisitor!" ) - raise Exception( + raise TypeError( "EventBody.addVisitor(v) - the given visitor is not a subclass of AbstractVisitor!" ) diff --git a/Autocoders/Python/src/fprime_ac/generators/EventHeader.py b/Autocoders/Python/src/fprime_ac/generators/EventHeader.py index b431c9ed7d..e54088c2e9 100644 --- a/Autocoders/Python/src/fprime_ac/generators/EventHeader.py +++ b/Autocoders/Python/src/fprime_ac/generators/EventHeader.py @@ -79,7 +79,7 @@ def accept(self, visitor): DEBUG.error( "EventHeader.accept() - the given visitor is not a subclass of AbstractVisitor!" ) - raise Exception( + raise TypeError( "EventHeader.accept() - the given visitor is not a subclass of AbstractVisitor!" ) @@ -94,7 +94,7 @@ def addVisitor(self, visitor): DEBUG.error( "EventHeader.addVisitor(v) - the given visitor is not a subclass of AbstractVisitor!" ) - raise Exception( + raise TypeError( "EventHeader.addVisitor(v) - the given visitor is not a subclass of AbstractVisitor!" ) diff --git a/Autocoders/Python/src/fprime_ac/generators/FinishSource.py b/Autocoders/Python/src/fprime_ac/generators/FinishSource.py index 352fbe402f..9615967ca7 100644 --- a/Autocoders/Python/src/fprime_ac/generators/FinishSource.py +++ b/Autocoders/Python/src/fprime_ac/generators/FinishSource.py @@ -79,7 +79,7 @@ def accept(self, visitor): DEBUG.error( "FinishSource.accept() - the given visitor is not a subclass of AbstractVisitor!" ) - raise Exception( + raise TypeError( "FinishSource.accept() - the given visitor is not a subclass of AbstractVisitor!" ) @@ -94,7 +94,7 @@ def addVisitor(self, visitor): DEBUG.error( "FinishSource.addVisitor(v) - the given visitor is not a subclass of AbstractVisitor!" ) - raise Exception( + raise TypeError( "FinishSource.addVisitor(v) - the given visitor is not a subclass of AbstractVisitor!" ) diff --git a/Autocoders/Python/src/fprime_ac/generators/HtmlDocPage.py b/Autocoders/Python/src/fprime_ac/generators/HtmlDocPage.py index 943ef39021..a204bc14cf 100644 --- a/Autocoders/Python/src/fprime_ac/generators/HtmlDocPage.py +++ b/Autocoders/Python/src/fprime_ac/generators/HtmlDocPage.py @@ -79,7 +79,7 @@ def accept(self, visitor): DEBUG.error( "HtmlDoc.accept() - the given visitor is not a subclass of AbstractVisitor!" ) - raise Exception( + raise TypeError( "HtmlDoc.accept() - the given visitor is not a subclass of AbstractVisitor!" ) @@ -94,7 +94,7 @@ def addVisitor(self, visitor): DEBUG.error( "HtmlDoc.addVisitor(v) - the given visitor is not a subclass of AbstractVisitor!" ) - raise Exception( + raise TypeError( "HtmlDoc.addVisitor(v) - the given visitor is not a subclass of AbstractVisitor!" ) diff --git a/Autocoders/Python/src/fprime_ac/generators/HtmlStartPage.py b/Autocoders/Python/src/fprime_ac/generators/HtmlStartPage.py index 081ff24abc..126ec695b3 100644 --- a/Autocoders/Python/src/fprime_ac/generators/HtmlStartPage.py +++ b/Autocoders/Python/src/fprime_ac/generators/HtmlStartPage.py @@ -79,7 +79,7 @@ def accept(self, visitor): DEBUG.error( "HtmlStartPage.accept() - the given visitor is not a subclass of AbstractVisitor!" ) - raise Exception( + raise TypeError( "HtmlStartPage.accept() - the given visitor is not a subclass of AbstractVisitor!" ) @@ -94,7 +94,7 @@ def addVisitor(self, visitor): DEBUG.error( "HtmlStartPage.addVisitor(v) - the given visitor is not a subclass of AbstractVisitor!" ) - raise Exception( + raise TypeError( "HtmlStartPage.addVisitor(v) - the given visitor is not a subclass of AbstractVisitor!" ) diff --git a/Autocoders/Python/src/fprime_ac/generators/Includes1.py b/Autocoders/Python/src/fprime_ac/generators/Includes1.py index c246ecc4e5..b80ebb040e 100644 --- a/Autocoders/Python/src/fprime_ac/generators/Includes1.py +++ b/Autocoders/Python/src/fprime_ac/generators/Includes1.py @@ -79,7 +79,7 @@ def accept(self, visitor): DEBUG.error( "Includes1.accept() - the given visitor is not a subclass of AbstractVisitor!" ) - raise Exception( + raise TypeError( "Includes1.accept() - the given visitor is not a subclass of AbstractVisitor!" ) @@ -94,7 +94,7 @@ def addVisitor(self, visitor): DEBUG.error( "Includes1.addVisitor(v) - the given visitor is not a subclass of AbstractVisitor!" ) - raise Exception( + raise TypeError( "Includes1.addVisitor(v) - the given visitor is not a subclass of AbstractVisitor!" ) diff --git a/Autocoders/Python/src/fprime_ac/generators/Includes2.py b/Autocoders/Python/src/fprime_ac/generators/Includes2.py index 7cfda5f929..b22d32c5bb 100644 --- a/Autocoders/Python/src/fprime_ac/generators/Includes2.py +++ b/Autocoders/Python/src/fprime_ac/generators/Includes2.py @@ -79,7 +79,7 @@ def accept(self, visitor): DEBUG.error( "Includes2.accept() - the given visitor is not a subclass of AbstractVisitor!" ) - raise Exception( + raise TypeError( "Includes2.accept() - the given visitor is not a subclass of AbstractVisitor!" ) @@ -94,7 +94,7 @@ def addVisitor(self, visitor): DEBUG.error( "Includes2.addVisitor(v) - the given visitor is not a subclass of AbstractVisitor!" ) - raise Exception( + raise TypeError( "Includes2.addVisitor(v) - the given visitor is not a subclass of AbstractVisitor!" ) diff --git a/Autocoders/Python/src/fprime_ac/generators/InitFiles.py b/Autocoders/Python/src/fprime_ac/generators/InitFiles.py index 4cc1eadc69..930e72605e 100644 --- a/Autocoders/Python/src/fprime_ac/generators/InitFiles.py +++ b/Autocoders/Python/src/fprime_ac/generators/InitFiles.py @@ -80,7 +80,7 @@ def accept(self, visitor): DEBUG.error( "InitFiles.accept() - the given visitor is not a subclass of AbstractVisitor!" ) - raise Exception( + raise TypeError( "InitFiles.accept() - the given visitor is not a subclass of AbstractVisitor!" ) @@ -95,7 +95,7 @@ def addVisitor(self, visitor): DEBUG.error( "InitFiles.addVisitor(v) - the given visitor is not a subclass of AbstractVisitor!" ) - raise Exception( + raise TypeError( "InitFiles.addVisitor(v) - the given visitor is not a subclass of AbstractVisitor!" ) diff --git a/Autocoders/Python/src/fprime_ac/generators/InstanceDictBody.py b/Autocoders/Python/src/fprime_ac/generators/InstanceDictBody.py index dc12163270..c1a83c250a 100644 --- a/Autocoders/Python/src/fprime_ac/generators/InstanceDictBody.py +++ b/Autocoders/Python/src/fprime_ac/generators/InstanceDictBody.py @@ -79,7 +79,7 @@ def accept(self, visitor, topology_model): DEBUG.error( "InstanceDictBodyVisit.accept() - the given visitor is not a subclass of AbstractVisitor!" ) - raise Exception( + raise TypeError( "InstanceDictBodyVisit.accept() - the given visitor is not a subclass of AbstractVisitor!" ) @@ -94,7 +94,7 @@ def addVisitor(self, visitor): DEBUG.error( "InstanceDictBodyVisit.addVisitor(v) - the given visitor is not a subclass of AbstractVisitor!" ) - raise Exception( + raise TypeError( "InstanceDictBodyVisit.addVisitor(v) - the given visitor is not a subclass of AbstractVisitor!" ) diff --git a/Autocoders/Python/src/fprime_ac/generators/InstanceDictHeader.py b/Autocoders/Python/src/fprime_ac/generators/InstanceDictHeader.py index b1098e42c7..91dbe32ba9 100644 --- a/Autocoders/Python/src/fprime_ac/generators/InstanceDictHeader.py +++ b/Autocoders/Python/src/fprime_ac/generators/InstanceDictHeader.py @@ -79,7 +79,7 @@ def accept(self, visitor, topology_model): DEBUG.error( "InstanceDictHeaderVisit.accept() - the given visitor is not a subclass of AbstractVisitor!" ) - raise Exception( + raise TypeError( "InstanceDictHeaderVisit.accept() - the given visitor is not a subclass of AbstractVisitor!" ) @@ -94,7 +94,7 @@ def addVisitor(self, visitor): DEBUG.error( "InstanceDictHeaderVisit.addVisitor(v) - the given visitor is not a subclass of AbstractVisitor!" ) - raise Exception( + raise TypeError( "InstanceDictHeaderVisit.addVisitor(v) - the given visitor is not a subclass of AbstractVisitor!" ) diff --git a/Autocoders/Python/src/fprime_ac/generators/InstanceDictStart.py b/Autocoders/Python/src/fprime_ac/generators/InstanceDictStart.py index 1430de5c39..9478f3e198 100644 --- a/Autocoders/Python/src/fprime_ac/generators/InstanceDictStart.py +++ b/Autocoders/Python/src/fprime_ac/generators/InstanceDictStart.py @@ -79,7 +79,7 @@ def accept(self, visitor, topology_model): DEBUG.error( "InstanceDictStartVisit.accept() - the given visitor is not a subclass of AbstractVisitor!" ) - raise Exception( + raise TypeError( "InstanceDictStartVisit.accept() - the given visitor is not a subclass of AbstractVisitor!" ) @@ -94,7 +94,7 @@ def addVisitor(self, visitor): DEBUG.error( "InstanceDictStartVisit.addVisitor(v) - the given visitor is not a subclass of AbstractVisitor!" ) - raise Exception( + raise TypeError( "InstanceDictStartVisit.addVisitor(v) - the given visitor is not a subclass of AbstractVisitor!" ) diff --git a/Autocoders/Python/src/fprime_ac/generators/MdDocPage.py b/Autocoders/Python/src/fprime_ac/generators/MdDocPage.py index 3f35ab27db..d24d9c42d8 100644 --- a/Autocoders/Python/src/fprime_ac/generators/MdDocPage.py +++ b/Autocoders/Python/src/fprime_ac/generators/MdDocPage.py @@ -79,7 +79,7 @@ def accept(self, visitor): DEBUG.error( "MdDoc.accept() - the given visitor is not a subclass of AbstractVisitor!" ) - raise Exception( + raise TypeError( "MdDoc.accept() - the given visitor is not a subclass of AbstractVisitor!" ) @@ -94,7 +94,7 @@ def addVisitor(self, visitor): DEBUG.error( "MdDoc.addVisitor(v) - the given visitor is not a subclass of AbstractVisitor!" ) - raise Exception( + raise TypeError( "MdDoc.addVisitor(v) - the given visitor is not a subclass of AbstractVisitor!" ) diff --git a/Autocoders/Python/src/fprime_ac/generators/MdStartPage.py b/Autocoders/Python/src/fprime_ac/generators/MdStartPage.py index 09a91fd1b2..55502b2806 100644 --- a/Autocoders/Python/src/fprime_ac/generators/MdStartPage.py +++ b/Autocoders/Python/src/fprime_ac/generators/MdStartPage.py @@ -79,7 +79,7 @@ def accept(self, visitor): DEBUG.error( "MDStartPage.accept() - the given visitor is not a subclass of AbstractVisitor!" ) - raise Exception( + raise TypeError( "MdStartPage.accept() - the given visitor is not a subclass of AbstractVisitor!" ) @@ -94,7 +94,7 @@ def addVisitor(self, visitor): DEBUG.error( "MdStartPage.addVisitor(v) - the given visitor is not a subclass of AbstractVisitor!" ) - raise Exception( + raise TypeError( "MdStartPage.addVisitor(v) - the given visitor is not a subclass of AbstractVisitor!" ) diff --git a/Autocoders/Python/src/fprime_ac/generators/Namespace.py b/Autocoders/Python/src/fprime_ac/generators/Namespace.py index da5c08ded2..6267ddc5c3 100644 --- a/Autocoders/Python/src/fprime_ac/generators/Namespace.py +++ b/Autocoders/Python/src/fprime_ac/generators/Namespace.py @@ -80,7 +80,7 @@ def accept(self, visitor): DEBUG.error( "Namespace.accept() - the given visitor is not a subclass of AbstractVisitor!" ) - raise Exception( + raise TypeError( "Namespace.accept() - the given visitor is not a subclass of AbstractVisitor!" ) @@ -95,7 +95,7 @@ def addVisitor(self, visitor): DEBUG.error( "Namespace.addVisitor(v) - the given visitor is not a subclass of AbstractVisitor!" ) - raise Exception( + raise TypeError( "Namespace.addVisitor(v) - the given visitor is not a subclass of AbstractVisitor!" ) diff --git a/Autocoders/Python/src/fprime_ac/generators/Private.py b/Autocoders/Python/src/fprime_ac/generators/Private.py index 1708128d1f..e4a42ccf2b 100644 --- a/Autocoders/Python/src/fprime_ac/generators/Private.py +++ b/Autocoders/Python/src/fprime_ac/generators/Private.py @@ -79,7 +79,7 @@ def accept(self, visitor): DEBUG.error( "Private.accept() - the given visitor is not a subclass of AbstractVisitor!" ) - raise Exception( + raise TypeError( "Private.accept() - the given visitor is not a subclass of AbstractVisitor!" ) @@ -94,7 +94,7 @@ def addVisitor(self, visitor): DEBUG.error( "Private.addVisitor(v) - the given visitor is not a subclass of AbstractVisitor!" ) - raise Exception( + raise TypeError( "Private.addVisitor(v) - the given visitor is not a subclass of AbstractVisitor!" ) diff --git a/Autocoders/Python/src/fprime_ac/generators/Protected.py b/Autocoders/Python/src/fprime_ac/generators/Protected.py index d553a52090..af6a1a4112 100644 --- a/Autocoders/Python/src/fprime_ac/generators/Protected.py +++ b/Autocoders/Python/src/fprime_ac/generators/Protected.py @@ -79,7 +79,7 @@ def accept(self, visitor): DEBUG.error( "Protected.accept() - the given visitor is not a subclass of AbstractVisitor!" ) - raise Exception( + raise TypeError( "Protected.accept() - the given visitor is not a subclass of AbstractVisitor!" ) @@ -94,7 +94,7 @@ def addVisitor(self, visitor): DEBUG.error( "Protected.addVisitor(v) - the given visitor is not a subclass of AbstractVisitor!" ) - raise Exception( + raise TypeError( "Protected.addVisitor(v) - the given visitor is not a subclass of AbstractVisitor!" ) diff --git a/Autocoders/Python/src/fprime_ac/generators/Public.py b/Autocoders/Python/src/fprime_ac/generators/Public.py index 7a03cb02d4..77a7fa51e1 100644 --- a/Autocoders/Python/src/fprime_ac/generators/Public.py +++ b/Autocoders/Python/src/fprime_ac/generators/Public.py @@ -79,7 +79,7 @@ def accept(self, visitor): DEBUG.error( "Public.accept() - the given visitor is not a subclass of AbstractVisitor!" ) - raise Exception( + raise TypeError( "Public.accept() - the given visitor is not a subclass of AbstractVisitor!" ) @@ -94,7 +94,7 @@ def addVisitor(self, visitor): DEBUG.error( "Public.addVisitor(v) - the given visitor is not a subclass of AbstractVisitor!" ) - raise Exception( + raise TypeError( "Public.addVisitor(v) - the given visitor is not a subclass of AbstractVisitor!" ) diff --git a/Autocoders/Python/src/fprime_ac/generators/StartChannel.py b/Autocoders/Python/src/fprime_ac/generators/StartChannel.py index 5c6939ac79..e2c7dc9249 100644 --- a/Autocoders/Python/src/fprime_ac/generators/StartChannel.py +++ b/Autocoders/Python/src/fprime_ac/generators/StartChannel.py @@ -79,7 +79,7 @@ def accept(self, visitor): DEBUG.error( "startChannelVisit.accept() - the given visitor is not a subclass of AbstractVisitor!" ) - raise Exception( + raise TypeError( "startChannelVisit.accept() - the given visitor is not a subclass of AbstractVisitor!" ) @@ -94,7 +94,7 @@ def addVisitor(self, visitor): DEBUG.error( "startChannelVisit.addVisitor(v) - the given visitor is not a subclass of AbstractVisitor!" ) - raise Exception( + raise TypeError( "startChannelVisit.addVisitor(v) - the given visitor is not a subclass of AbstractVisitor!" ) diff --git a/Autocoders/Python/src/fprime_ac/generators/StartCommand.py b/Autocoders/Python/src/fprime_ac/generators/StartCommand.py index 53a3a5496c..803d6202d0 100644 --- a/Autocoders/Python/src/fprime_ac/generators/StartCommand.py +++ b/Autocoders/Python/src/fprime_ac/generators/StartCommand.py @@ -79,7 +79,7 @@ def accept(self, visitor): DEBUG.error( "startCommandVisit.accept() - the given visitor is not a subclass of AbstractVisitor!" ) - raise Exception( + raise TypeError( "startCommandVisit.accept() - the given visitor is not a subclass of AbstractVisitor!" ) @@ -94,7 +94,7 @@ def addVisitor(self, visitor): DEBUG.error( "startCommandVisit.addVisitor(v) - the given visitor is not a subclass of AbstractVisitor!" ) - raise Exception( + raise TypeError( "startCommandVisit.addVisitor(v) - the given visitor is not a subclass of AbstractVisitor!" ) diff --git a/Autocoders/Python/src/fprime_ac/generators/StartEvent.py b/Autocoders/Python/src/fprime_ac/generators/StartEvent.py index fa4c3e3f12..2f9913dd3c 100644 --- a/Autocoders/Python/src/fprime_ac/generators/StartEvent.py +++ b/Autocoders/Python/src/fprime_ac/generators/StartEvent.py @@ -79,7 +79,7 @@ def accept(self, visitor): DEBUG.error( "StartEvent.accept() - the given visitor is not a subclass of AbstractVisitor!" ) - raise Exception( + raise TypeError( "StartEvent.accept() - the given visitor is not a subclass of AbstractVisitor!" ) @@ -94,7 +94,7 @@ def addVisitor(self, visitor): DEBUG.error( "StartEvent.addVisitor(v) - the given visitor is not a subclass of AbstractVisitor!" ) - raise Exception( + raise TypeError( "StartEvent.addVisitor(v) - the given visitor is not a subclass of AbstractVisitor!" ) diff --git a/Autocoders/Python/src/fprime_ac/generators/StartSource.py b/Autocoders/Python/src/fprime_ac/generators/StartSource.py index 88d511a2f0..e1832f7462 100644 --- a/Autocoders/Python/src/fprime_ac/generators/StartSource.py +++ b/Autocoders/Python/src/fprime_ac/generators/StartSource.py @@ -80,7 +80,7 @@ def accept(self, visitor): DEBUG.error( "StartSource.accept() - the given visitor is not a subclass of AbstractVisitor!" ) - raise Exception( + raise TypeError( "StartSource.accept() - the given visitor is not a subclass of AbstractVisitor!" ) @@ -95,7 +95,7 @@ def addVisitor(self, visitor): DEBUG.error( "StartSource.addVisitor(v) - the given visitor is not a subclass of AbstractVisitor!" ) - raise Exception( + raise TypeError( "StartSource.addVisitor(v) - the given visitor is not a subclass of AbstractVisitor!" ) diff --git a/Autocoders/Python/src/fprime_ac/generators/formatters.py b/Autocoders/Python/src/fprime_ac/generators/formatters.py index 80418ec56f..db70e479c9 100644 --- a/Autocoders/Python/src/fprime_ac/generators/formatters.py +++ b/Autocoders/Python/src/fprime_ac/generators/formatters.py @@ -705,7 +705,7 @@ def opcodeStemName(self, id, name): "ERROR: DETECTED AN INVALID CHARACTER IN COMMAND STEM NAME (%s)." % name_string ) - raise Exception( + raise ValueError( "Fatal error, detected an invalid character in command stem name." ) # All is ok @@ -728,7 +728,7 @@ def opcodeStemNameValidate(self, id, cmd_name_list): for c in cmds: if sum([int(x == c) for x in cmds]) > 1: PRINT.info("ERROR: DETECTED %s COMMAND STEM NAME REPEATED." % c) - raise Exception("Error detected repeated command stem name.") + raise ValueError("Error detected repeated command stem name.") return True def evrNamePrefix(self, name): @@ -1119,14 +1119,14 @@ def formatFun(self, indent, one_line): "ERROR: No left paren in function name passed to formatFun: %s." % one_line ) - raise Exception("No left paren in function name passed to formatFun.") + raise ValueError("No left paren in function name passed to formatFun.") two_chunks = one_line.split("(") if len(two_chunks) != 2: PRINT.info( "ERROR: Too many left parens in name passed to formatFun: %s" % one_line ) - raise Exception("Too many left parens in name passed to formatFun.") + raise ValueError("Too many left parens in name passed to formatFun.") type_and_name = two_chunks[0] args = two_chunks[1] diff --git a/Autocoders/Python/src/fprime_ac/generators/visitors/AbstractVisitor.py b/Autocoders/Python/src/fprime_ac/generators/visitors/AbstractVisitor.py index 320528d6af..4c8b81a625 100644 --- a/Autocoders/Python/src/fprime_ac/generators/visitors/AbstractVisitor.py +++ b/Autocoders/Python/src/fprime_ac/generators/visitors/AbstractVisitor.py @@ -67,7 +67,7 @@ def initFilesVisit(self, obj): Defined to generate files for generated code products. @param args: the instance of the concrete element to operation on. """ - raise Exception( + raise NotImplementedError( "# AbstractVisitor.initFilesVisit() - Implementation Error: you must supply your own concrete implementation." ) @@ -75,7 +75,7 @@ def startSourceFilesVisit(self, obj): """ Defined to generate starting static code within files. """ - raise Exception( + raise NotImplementedError( "# AbstractVisitor.startSourceFilesVisit() - Implementation Error: you must supply your own concrete implementation." ) @@ -85,7 +85,7 @@ def includes1Visit(self, obj): Usually used for the base classes but also for Port types @param args: the instance of the concrete element to operation on. """ - raise Exception( + raise NotImplementedError( "# AbstractVisitor.includesVisit1() - Implementation Error: you must supply your own concrete implementation." ) @@ -95,7 +95,7 @@ def includes2Visit(self, obj): Usually used for data type includes and system includes. @param args: the instance of the concrete element to operation on. """ - raise Exception( + raise NotImplementedError( "# AbstractVisitor.includesVisit2() - Implementation Error: you must supply your own concrete implementation." ) @@ -105,7 +105,7 @@ def namespaceVisit(self, obj): Also any pre-condition code is generated. @param args: the instance of the concrete element to operation on. """ - raise Exception( + raise NotImplementedError( "# AbstractVisitor.namespaceVisit() - Implementation Error: you must supply your own concrete implementation." ) @@ -114,7 +114,7 @@ def publicVisit(self, obj): Defined to generate public stuff within a class. @param args: the instance of the concrete element to operation on. """ - raise Exception( + raise NotImplementedError( "# AbstractVisitor.publicVisit() - Implementation Error: you must supply your own concrete implementation." ) @@ -123,7 +123,7 @@ def protectedVisit(self, obj): Defined to generate protected stuff within a class. @param args: the instance of the concrete element to operation on. """ - raise Exception( + raise NotImplementedError( "# AbstractVisitor.protectedVisit() - Implementation Error: you must supply your own concrete implementation." ) @@ -132,7 +132,7 @@ def privateVisit(self, obj): Defined to generate private stuff within a class. @param args: the instance of the concrete element to operation on. """ - raise Exception( + raise NotImplementedError( "# AbstractVisitor.privateVisit() - Implementation Error: you must supply your own concrete implementation." ) @@ -140,7 +140,7 @@ def finishSourceFilesVisit(self, obj): """ Defined to generate ending static code within files. """ - raise Exception( + raise NotImplementedError( "# AbstractVisitor.endSourceFilesVisit() - Implementation Error: you must supply your own concrete implementation." ) @@ -148,7 +148,7 @@ def DictStartVisit(self, obj): """ Defined to generate start of command Python class. """ - raise Exception( + raise NotImplementedError( "# DictStartVisit.startCommandVisit() - Implementation Error: you must supply your own concrete implementation." ) @@ -156,7 +156,7 @@ def DictHeaderVisit(self, obj): """ Defined to generate header for Python command class. """ - raise Exception( + raise NotImplementedError( "# DictStartVisit.commandHeaderVisit() - Implementation Error: you must supply your own concrete implementation." ) @@ -164,7 +164,7 @@ def DictBodyVisit(self, obj): """ Defined to generate body for Python command class. """ - raise Exception( + raise NotImplementedError( "# DictStartVisit.commandBodyVisit() - Implementation Error: you must supply your own concrete implementation." ) diff --git a/Autocoders/Python/src/fprime_ac/generators/visitors/CommandVisitor.py b/Autocoders/Python/src/fprime_ac/generators/visitors/CommandVisitor.py index 8a820e71b7..dbf61022ed 100644 --- a/Autocoders/Python/src/fprime_ac/generators/visitors/CommandVisitor.py +++ b/Autocoders/Python/src/fprime_ac/generators/visitors/CommandVisitor.py @@ -131,7 +131,7 @@ def DictStartVisit(self, obj): if len(obj.get_set_opcodes()) == 1: # set/save opcode numbers had better match if len(obj.get_set_opcodes()) != len(obj.get_save_opcodes()): - raise Exception("set/save opcode quantities do not match!") + raise ValueError("set/save opcode quantities do not match!") pyfile = "{}/{}_PRM_SET.py".format(output_dir, self.__stem) fd = open(pyfile, "w") if fd is None: diff --git a/Autocoders/Python/src/fprime_ac/generators/visitors/InstanceChannelVisitor.py b/Autocoders/Python/src/fprime_ac/generators/visitors/InstanceChannelVisitor.py index 958a91fd61..dd9b9856cb 100644 --- a/Autocoders/Python/src/fprime_ac/generators/visitors/InstanceChannelVisitor.py +++ b/Autocoders/Python/src/fprime_ac/generators/visitors/InstanceChannelVisitor.py @@ -176,7 +176,7 @@ def DictBodyVisit(self, obj, topology_model): c.name = fname if len(obj.get_ids()) > 1: - raise Exception( + raise ValueError( "There is more than one event id when creating dictionaries. Check xml of {} or see if multiple explicit IDs exist in the AcConstants.ini file".format( fname ) diff --git a/Autocoders/Python/src/fprime_ac/generators/visitors/InstanceEventVisitor.py b/Autocoders/Python/src/fprime_ac/generators/visitors/InstanceEventVisitor.py index 41b82789a0..386bd44f0e 100644 --- a/Autocoders/Python/src/fprime_ac/generators/visitors/InstanceEventVisitor.py +++ b/Autocoders/Python/src/fprime_ac/generators/visitors/InstanceEventVisitor.py @@ -179,7 +179,7 @@ def DictBodyVisit(self, obj, topology_model): c.name = fname if len(obj.get_ids()) > 1: - raise Exception( + raise ValueError( "There is more than one event id when creating dictionaries. Check xml of {} or see if multiple explicit IDs exist in the AcConstants.ini file".format( fname )