Fix ruff notes

Author: ruscoder

fhirpathpy/engine/__init__.py

@@ -1,11 +1,12 @@
 import json
 import numbers
-import fhirpathpy.engine.util as util
-from fhirpathpy.engine.nodes import TypeInfo
+
+from fhirpathpy.engine import util
 from fhirpathpy.engine.evaluators import evaluators
 from fhirpathpy.engine.invocations import (
     invocation_registry as base_invocation_registry,
 )
+from fhirpathpy.engine.nodes import TypeInfo
 
 
 def check_integer_param(val):

fhirpathpy/engine/evaluators/__init__.py

@@ -1,12 +1,11 @@
+import json
+import re
 from collections import abc
 from decimal import Decimal
 from functools import reduce
 
-import re
-import json
-import fhirpathpy.engine as engine
-import fhirpathpy.engine.util as util
-import fhirpathpy.engine.nodes as nodes
+from fhirpathpy import engine
+from fhirpathpy.engine import nodes, util
 
 
 def boolean_literal(ctx, parentData, node):
@@ -71,7 +70,7 @@ def alias_op_expression(mapFn):
     def func(ctx, parentData, node):
         op = node["terminalNodeText"][0]
 
-        if not op in mapFn:
+        if op not in mapFn:
             raise Exception("Do not know how to alias " + op + " by " + json.dumps(mapFn))
 
         alias = mapFn[op]
@@ -204,9 +203,8 @@ def func(acc, res):
             toAdd_ = res.data.get(f"_{key}")
             if key == "extension":
                 childPath = "Extension"
-        else:
-            if key == "length":
-                toAdd = len(res.data)
+        elif key == "length":
+            toAdd = len(res.data)
 
         childPath = (
             model["path2Type"].get(childPath, childPath)

fhirpathpy/engine/invocations/__init__.py

@@ -1,19 +1,21 @@
 from decimal import Decimal
 
-import fhirpathpy.engine.invocations.collections as collections
-import fhirpathpy.engine.invocations.existence as existence
-import fhirpathpy.engine.invocations.filtering as filtering
-import fhirpathpy.engine.invocations.subsetting as subsetting
-import fhirpathpy.engine.invocations.strings as strings
-import fhirpathpy.engine.invocations.navigation as navigation
-import fhirpathpy.engine.invocations.combining as combining
-import fhirpathpy.engine.invocations.math as math
-import fhirpathpy.engine.invocations.misc as misc
-import fhirpathpy.engine.invocations.equality as equality
-import fhirpathpy.engine.invocations.logic as logic
-import fhirpathpy.engine.invocations.datetime as datetime
-import fhirpathpy.engine.invocations.types as types
-import fhirpathpy.engine.invocations.aggregate as aggregate
+from fhirpathpy.engine.invocations import (
+    aggregate,
+    collections,
+    combining,
+    datetime,
+    equality,
+    existence,
+    filtering,
+    logic,
+    math,
+    misc,
+    navigation,
+    strings,
+    subsetting,
+    types,
+)
 from fhirpathpy.engine.nodes import FP_DateTime, FP_Quantity, FP_Time
 
 invocation_registry = {

fhirpathpy/engine/invocations/combining.py

@@ -1,4 +1,4 @@
-import fhirpathpy.engine.invocations.existence as existence
+from fhirpathpy.engine.invocations import existence
 
 """
 This file holds code to hande the FHIRPath Combining functions

fhirpathpy/engine/invocations/equality.py

@@ -1,8 +1,8 @@
+import json
 from collections import abc
 from decimal import Decimal
-import json
-import fhirpathpy.engine.util as util
-import fhirpathpy.engine.nodes as nodes
+
+from fhirpathpy.engine import nodes, util
 
 """
 This file holds code to hande the FHIRPath Math functions.
@@ -81,7 +81,7 @@ def equivalence(ctx, x, y):
     if isinstance(x_val, nodes.FP_Quantity) and isinstance(y_val, nodes.FP_Quantity):
         return x_val.deep_equal(y_val)
 
-    if isinstance(a, (abc.Mapping, list)) and isinstance(b, (abc.Mapping, list)):
+    if isinstance(a, abc.Mapping | list) and isinstance(b, abc.Mapping | list):
 
         def deep_equal(a, b):
             if isinstance(a, abc.Mapping) and isinstance(b, abc.Mapping):
@@ -94,7 +94,7 @@ def deep_equal(a, b):
                 )
             elif isinstance(a, str) and isinstance(b, str):
                 return normalize_string(a) == normalize_string(b)
-            elif isinstance(a, (int, float)) and isinstance(b, (int, float)):
+            elif isinstance(a, int | float) and isinstance(b, int | float):
                 return abs(a - b) < 0.5
             else:
                 return a == b
@@ -190,12 +190,11 @@ def typecheck(a, b):
     if lClass != rClass and not areNumbers:
         d = None
 
-        # TODO refactor
-        if lClass == str and (rClass == nodes.FP_DateTime or rClass == nodes.FP_Time):
+        if lClass is str and (rClass in (nodes.FP_DateTime, nodes.FP_Time)):
             d = nodes.FP_DateTime(a) or nodes.FP_Time(a)
             if d is not None:
                 rtn = [d, b]
-        elif rClass == str and (lClass == nodes.FP_DateTime or lClass == nodes.FP_Time):
+        elif rClass is str and (lClass in (nodes.FP_DateTime, nodes.FP_Time)):
             d = nodes.FP_DateTime(b) or nodes.FP_Time(b)
             if d is not None:
                 rtn = [a, d]

fhirpathpy/engine/invocations/existence.py

@@ -1,10 +1,7 @@
 from decimal import Decimal
-from fhirpathpy.engine.invocations import misc
-from fhirpathpy.engine.invocations.misc import to_boolean
-import fhirpathpy.engine.util as util
-import fhirpathpy.engine.nodes as nodes
-import fhirpathpy.engine.invocations.filtering as filtering
 
+from fhirpathpy.engine import nodes, util
+from fhirpathpy.engine.invocations import filtering, misc
 
 """
 This file holds code to hande the FHIRPath Existence functions
@@ -54,7 +51,7 @@ def all_macro(ctx, colls, expr):
 
 def extract_boolean_value(data):
     value = util.get_data(data)
-    if type(value) != bool:
+    if type(value) is not bool:
         raise Exception("Found type '" + type(data) + "' but was expecting bool")
     return value
 

fhirpathpy/engine/invocations/filtering.py

@@ -1,8 +1,6 @@
 from collections import abc
-from decimal import Decimal
-import numbers
-import fhirpathpy.engine.util as util
-import fhirpathpy.engine.nodes as nodes
+
+from fhirpathpy.engine import nodes, util
 
 # Contains the FHIRPath Filtering and Projection functions.
 # (Section 5.2 of the FHIRPath 1.0.0 specification).
@@ -54,18 +52,18 @@ def repeat_macro(ctx, data, expr):
     res = []
     items = data
 
-    next = None
+    next_item = None
     lres = None
 
     uniq = set()
 
     while len(items) != 0:
-        next = items[0]
+        next_item = items[0]
         items = items[1:]
-        lres = [l for l in expr(next) if l not in uniq]
+        lres = [elem for elem in expr(next_item) if elem not in uniq]
         if len(lres) > 0:
-            for l in lres:
-                uniq.add(l)
+            for elem in lres:
+                uniq.add(elem)
             res = res + lres
             items = items + lres
 

fhirpathpy/engine/invocations/logic.py

@@ -1,13 +1,13 @@
 def or_op(ctx, a, b):
     if isinstance(b, list):
-        if a == True:
+        if a is True:
             return True
-        if a == False:
+        if a is False:
             return []
         if isinstance(a, list):
             return []
     if isinstance(a, list):
-        if b == True:
+        if b is True:
             return True
         return []
 
@@ -16,15 +16,15 @@ def or_op(ctx, a, b):
 
 def and_op(ctx, a, b):
     if isinstance(b, list):
-        if a == True:
+        if a is True:
             return []
-        if a == False:
+        if a is False:
             return False
         if isinstance(a, list):
             return []
 
     if isinstance(a, list):
-        if b == True:
+        if b is True:
             return []
         return False
 
@@ -42,19 +42,19 @@ def xor_op(ctx, a, b):
 
 def implies_op(ctx, a, b):
     if isinstance(b, list):
-        if a == True:
+        if a is True:
             return []
-        if a == False:
+        if a is False:
             return True
         if isinstance(a, list):
             return []
 
     if isinstance(a, list):
-        if b == True:
+        if b is True:
             return True
         return []
 
-    if a == False:
+    if a is False:
         return True
 
     return a and b

fhirpathpy/engine/invocations/math.py

@@ -1,7 +1,7 @@
 from decimal import Decimal
+
+from fhirpathpy.engine import nodes, util
 from fhirpathpy.engine.invocations.equality import remove_duplicate_extension
-import fhirpathpy.engine.util as util
-import fhirpathpy.engine.nodes as nodes
 
 """
 Adds the math functions to the given FHIRPath engine.

fhirpathpy/engine/invocations/misc.py

@@ -1,8 +1,7 @@
 import re
 from decimal import Decimal
 
-import fhirpathpy.engine.util as util
-import fhirpathpy.engine.nodes as nodes
+from fhirpathpy.engine import nodes, util
 
 # This file holds code to hande the FHIRPath Existence functions (5.1 in the
 # specification).
@@ -36,10 +35,10 @@ def to_integer(ctx, coll):
 
     value = util.get_data(coll[0])
 
-    if value == False:
+    if value is False:
         return 0
 
-    if value == True:
+    if value is True:
         return 1
 
     if util.is_number(value):
@@ -72,7 +71,7 @@ def to_quantity(ctx, coll, to_unit=None):
         v = util.val_data_converted(coll[0])
         quantity_regex_res = None
 
-        if isinstance(v, (int, Decimal)):
+        if isinstance(v, int | Decimal):
             result = nodes.FP_Quantity(v, "'1'")
         elif isinstance(v, nodes.FP_Quantity):
             result = v
@@ -211,10 +210,10 @@ def to_boolean(ctx, coll):
 
     if var_type == "bool":
         return val
-    elif var_type == "int" or var_type == "float":
-        if val == 1 or val == 1.0:
+    elif var_type in ("int", "float"):
+        if val in (1, 1.0):
             return True
-        elif val == 0 or val == 0.0:
+        elif val in (0, 0.0):
             return False
     elif var_type == "str":
         lower_case_var = val.lower()
@@ -248,17 +247,13 @@ def string_singleton(coll):
 
 def singleton(coll, type):
     if len(coll) > 1:
-        raise Exception(
-            "Unexpected collection {coll}; expected singleton of type {type}".format(
-                coll=coll, type=type
-            )
-        )
+        raise Exception(f"Unexpected collection {coll}; expected singleton of type {type}")
     elif len(coll) == 0:
         return []
     to_singleton = singleton_eval_by_type[type]
     if to_singleton:
         val = to_singleton(coll)
         if val is not None:
             return val
-        raise Exception("Expected {type}, but got: {coll}".format(type=type.lower(), coll=coll))
-    raise Exception("Not supported type {}".format(type))
+        raise Exception(f"Expected {type.lower()}, but got: {coll}")
+    raise Exception(f"Not supported type {type}")