@@ -959,122 +959,119 @@ def _evaluate(self, x, parent_attr):
959959 operator = self ._operator
960960 value = self ._value
961961
962- # TODO: Once Python 3.9 is no longer supported, this is a good
963- # candidate for PEP 622 – Structural Pattern Matching
964- # (https://peps.python.org/pep-0622)
962+ match operator :
963+ case "gt" :
964+ _gt = getattr (x , "__query_gt__" , None )
965+ if _gt is not None :
966+ return _gt (value )
965967
966- if operator == "gt" :
967- _gt = getattr (x , "__query_gt__" , None )
968- if _gt is not None :
969- return _gt (value )
968+ return x > value
970969
971- return x > value
970+ case "wi" :
971+ _wi = getattr (x , "__query_wi__" , None )
972+ if _wi is not None :
973+ return _wi (value , self .open_lower , self .open_upper )
972974
973- if operator == "wi" :
974- _wi = getattr ( x , "__query_wi__" , None )
975- if _wi is not None :
976- return _wi ( value , self . open_lower , self . open_upper )
975+ if self . open_lower :
976+ lower_bound = x > value [ 0 ]
977+ else :
978+ lower_bound = x >= value [ 0 ]
977979
978- if self .open_lower :
979- lower_bound = x > value [0 ]
980- else :
981- lower_bound = x > =value [0 ]
980+ if self .open_upper :
981+ upper_bound = x < value [1 ]
982+ else :
983+ upper_bound = x < =value [1 ]
982984
983- if self .open_upper :
984- upper_bound = x < value [1 ]
985- else :
986- upper_bound = x <= value [1 ]
985+ return lower_bound & upper_bound
987986
988- return lower_bound & upper_bound
987+ case "eq" :
988+ try :
989+ return bool (value .search (x ))
990+ except AttributeError :
991+ return x == value
992+ except TypeError :
993+ raise ValueError (
994+ "Can't perform regular expression search on a "
995+ f"non-string: { x !r}
996+ )
989997
990- if operator == "eq" :
991- try :
992- return bool (value .search (x ))
993- except AttributeError :
994- return x == value
995- except TypeError :
996- raise ValueError (
997- "Can't perform regular expression search on a "
998- f"non-string: { x !r}
999- )
998+ case "isclose" :
999+ rtol = self .rtol
1000+ atol = self .atol
1001+ if atol is None :
1002+ atol = cf_atol ().value
10001003
1001- if operator == "isclose" :
1002- rtol = self .rtol
1003- atol = self .atol
1004- if atol is None :
1005- atol = cf_atol ().value
1004+ if rtol is None :
1005+ rtol = cf_rtol ().value
10061006
1007- if rtol is None :
1008- rtol = cf_rtol ().value
1007+ _isclose = getattr (x , "__query_isclose__" , None )
1008+ if _isclose is not None :
1009+ return _isclose (value , rtol , atol )
10091010
1010- _isclose = getattr (x , "__query_isclose__" , None )
1011- if _isclose is not None :
1012- return _isclose (value , rtol , atol )
1011+ return np .isclose (x , value , rtol = rtol , atol = atol )
10131012
1014- return np .isclose (x , value , rtol = rtol , atol = atol )
1015-
1016- if operator == "ne" :
1017- try :
1018- return not bool (value .search (x ))
1019- except AttributeError :
1020- return x != value
1021- except TypeError :
1022- raise ValueError (
1023- "Can't perform regular expression search on a "
1024- f"non-string: { x !r}
1025- )
1013+ case "ne" :
1014+ try :
1015+ return not bool (value .search (x ))
1016+ except AttributeError :
1017+ return x != value
1018+ except TypeError :
1019+ raise ValueError (
1020+ "Can't perform regular expression search on a "
1021+ f"non-string: { x !r}
1022+ )
10261023
1027- if operator == "lt" :
1028- _lt = getattr (x , "__query_lt__" , None )
1029- if _lt is not None :
1030- return _lt (value )
1024+ case "lt" :
1025+ _lt = getattr (x , "__query_lt__" , None )
1026+ if _lt is not None :
1027+ return _lt (value )
10311028
1032- return x < value
1029+ return x < value
10331030
1034- if operator == "le" :
1035- _le = getattr (x , "__query_le__" , None )
1036- if _le is not None :
1037- return _le (value )
1031+ case "le" :
1032+ _le = getattr (x , "__query_le__" , None )
1033+ if _le is not None :
1034+ return _le (value )
10381035
1039- return x <= value
1036+ return x <= value
10401037
1041- if operator == "ge" :
1042- _ge = getattr (x , "__query_ge_" , None )
1043- if _ge is not None :
1044- return _ge (value )
1038+ case "ge" :
1039+ _ge = getattr (x , "__query_ge_" , None )
1040+ if _ge is not None :
1041+ return _ge (value )
10451042
1046- return x >= value
1043+ return x >= value
10471044
1048- if operator == "wo" :
1049- _wo = getattr (x , "__query_wo__" , None )
1050- if _wo is not None :
1051- return _wo (value )
1045+ case "wo" :
1046+ _wo = getattr (x , "__query_wo__" , None )
1047+ if _wo is not None :
1048+ return _wo (value )
10521049
1053- return (x < value [0 ]) | (x > value [1 ])
1050+ return (x < value [0 ]) | (x > value [1 ])
10541051
1055- if operator == "set" :
1056- if isinstance (x , str ):
1057- for v in value :
1058- try :
1059- if v .search (x ):
1060- return True
1061- except AttributeError :
1062- if x == v :
1063- return True
1052+ case "set" :
1053+ if isinstance (x , str ):
1054+ for v in value :
1055+ try :
1056+ if v .search (x ):
1057+ return True
1058+ except AttributeError :
1059+ if x == v :
1060+ return True
10641061
1065- return False
1066- else :
1067- _set = getattr (x , "__query_set__" , None )
1068- if _set is not None :
1069- return _set (value )
1070-
1071- i = iter (value )
1072- v = next (i )
1073- out = x == v
1074- for v in i :
1075- out |= x == v
1076-
1077- return out
1062+ return False
1063+ else :
1064+ _set = getattr (x , "__query_set__" , None )
1065+ if _set is not None :
1066+ return _set (value )
1067+
1068+ i = iter (value )
1069+ v = next (i )
1070+ out = x == v
1071+ for v in i :
1072+ out |= x == v
1073+
1074+ return out
10781075
10791076 def inspect (self ):
10801077 """Inspect the object for debugging.
0 commit comments