Merge pull request #10 from gregdenay/main

InvalidNodeError now also ihnerits from KeyError
CVUA-RRW · Jun 12, 2024 · 1f2b0c7 · 1f2b0c7
2 parents af79f46 + a757f85
commit 1f2b0c7
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 3 deletions.
diff --git a/HISTORY.md b/HISTORY.md
@@ -1,5 +1,11 @@
 # Release History
 
+## 2.5.1
+
+**Improvements**
+
+* taxidTools.InvalidNodeError now ihnerits from KeyError as well, this might be more intuitive for some users
+
 ## 2.5.0
 
 **New features**

diff --git a/taxidTools/__version__.py b/taxidTools/__version__.py
@@ -1,4 +1,4 @@
-__version__ = "2.5.0"
+__version__ = "2.5.1"
 __title__ = "taxidTools"
 __description__ = "A Python Toolkit for Taxonomy"
 __author__ = "Gregoire Denay"

diff --git a/taxidTools/exceptions.py b/taxidTools/exceptions.py
@@ -5,11 +5,11 @@
 
 class TaxonomyError(Exception):
     """Base Exception for all taxonomy related errors"""
-    default_message = 'An Taxonomy related error occured'
+    default_message = 'A Taxonomy related error occured'
 
     def __init__(self, message:str = None):
         super().__init__(message or self.default_message)
 
 
-class InvalidNodeError(TaxonomyError):
+class InvalidNodeError(TaxonomyError, KeyError):
     """Raised when a Node doesn't exist"""
diff --git a/tests/test_Taxonomy.py b/tests/test_Taxonomy.py
@@ -92,7 +92,9 @@ def test_copy(self):
         self.assertIsNotNone(self.new.get('0', None))
 
     def test_InvalidNodeError(self):
+        # Making sure InvalidNodeError can also be caught as a KeyError
         self.assertRaises(taxidTools.InvalidNodeError, self.txd.__getitem__, "notataxid")
+        self.assertRaises(KeyError, self.txd.__getitem__, "notataxid")
 
     def test_MergedNnode(self):
         self.merged = taxidTools.MergedNode(10, 1)