Refactor propr name formatting to reduce indents

equinor · Sep 28, 2023 · 2be6bea · 2be6bea
1 parent b577c65
commit 2be6bea
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 21 deletions.
diff --git a/src/ert/validation/proper_name_argument.py b/src/ert/validation/proper_name_argument.py
@@ -26,14 +26,13 @@ def validate(self, token: str) -> ValidationStatus:
 
         if not validation_status:
             return validation_status
-        else:
-            match = ProperNameArgument.PATTERN.match(token)
 
-            if match is None:
-                validation_status.setFailed()
-                validation_status.addToMessage(ProperNameArgument.NOT_A_VALID_NAME)
-            else:
-                if not validation_status.failed():
-                    validation_status.setValue(token)
+        match = ProperNameArgument.PATTERN.match(token)
 
-            return validation_status
+        if match is None:
+            validation_status.setFailed()
+            validation_status.addToMessage(ProperNameArgument.NOT_A_VALID_NAME)
+        elif not validation_status.failed():
+            validation_status.setValue(token)
+
+        return validation_status
diff --git a/src/ert/validation/proper_name_format_argument.py b/src/ert/validation/proper_name_format_argument.py
@@ -26,16 +26,15 @@ def validate(self, token: str) -> ValidationStatus:
 
         if not validation_status:
             return validation_status
-        else:
-            match = ProperNameFormatArgument.PATTERN.match(token)
-
-            if match is None:
-                validation_status.setFailed()
-                validation_status.addToMessage(
-                    ProperNameFormatArgument.NOT_A_VALID_NAME_FORMAT
-                )
-            else:
-                if not validation_status.failed():
-                    validation_status.setValue(token)
 
-            return validation_status
+        match = ProperNameFormatArgument.PATTERN.match(token)
+
+        if match is None:
+            validation_status.setFailed()
+            validation_status.addToMessage(
+                ProperNameFormatArgument.NOT_A_VALID_NAME_FORMAT
+            )
+        elif not validation_status.failed():
+            validation_status.setValue(token)
+
+        return validation_status