Remove catch/throw of an already thrown exception. self._is_valid_gl throws InvalidAlleleError

Author: pbashyal-nmdp

pyard/ard.py

@@ -440,12 +440,7 @@ def validate(self, glstring):
         :param glstring: GL String to validate
         :return: boolean indicating success
         """
-        try:
-            return self._is_valid_gl(glstring)
-        except InvalidAlleleError as e:
-            raise InvalidTypingError(
-                f"{glstring} is not valid GL String. \n {e.message}", e
-            ) from None
+        return self._is_valid_gl(glstring)
 
     def is_XX(self, glstring: str, loc_antigen: str = None, code: str = None) -> bool:
         if loc_antigen is None or code is None:

tests/steps/mac.py

@@ -1,7 +1,7 @@
 from behave import *
 from hamcrest import assert_that, is_
 
-from pyard.exceptions import InvalidTypingError
+from pyard.exceptions import InvalidAlleleError
 
 
 @given("the MAC code is {mac_code}")
@@ -38,7 +38,7 @@ def step_impl(context, mac_code):
 def step_impl(context):
     try:
         context.is_valid = context.ard.validate(context.mac_code)
-    except InvalidTypingError:
+    except InvalidAlleleError:
         context.is_valid = False
 
 

tests/test_pyard.py

@@ -34,7 +34,7 @@
 
 import pyard
 from pyard.constants import DEFAULT_CACHE_SIZE
-from pyard.exceptions import InvalidAlleleError, InvalidMACError, InvalidTypingError
+from pyard.exceptions import InvalidAlleleError
 from pyard.misc import validate_reduction_type
 
 
@@ -135,15 +135,15 @@ def test_redux_types(self):
             validate_reduction_type("XX")
 
     def test_empty_allele(self):
-        with self.assertRaises(InvalidTypingError):
+        with self.assertRaises(InvalidAlleleError):
             self.ard.redux("A*", "lgx")
 
     def test_fp_allele(self):
-        with self.assertRaises(InvalidTypingError):
+        with self.assertRaises(InvalidAlleleError):
             self.ard.redux("A*0.123", "lgx")
 
     def test_empty_fields(self):
-        with self.assertRaises(InvalidTypingError):
+        with self.assertRaises(InvalidAlleleError):
             # : without any data
             self.ard.redux("DQA1*01:01:01:G", "lgx")
 
@@ -152,7 +152,7 @@ def test_invalid_serology(self):
         serology_a10 = self.ard.redux("A10", "lgx")
         self.assertEqual(serology_a10.split("/")[0], "A*25:01")
         # And A100 isn't a valid typing
-        with self.assertRaises(InvalidTypingError):
+        with self.assertRaises(InvalidAlleleError):
             self.ard.redux("A100", "lgx")
 
     def test_allele_duplicated(self):