@@ -1021,25 +1021,13 @@ def _find_library(
1021
1021
base_dir : str ,
1022
1022
variables : Optional [Dict [str , Any ]] = None ,
1023
1023
) -> str :
1024
-
1025
- if contains_variable (name , "$@&%" ):
1026
- return find_library (
1027
- name ,
1028
- str (self .root_folder ),
1029
- base_dir ,
1030
- self .get_resolvable_command_line_variables (),
1031
- variables ,
1032
- )
1033
-
1034
- if name in STDLIBS :
1035
- result = ROBOT_LIBRARY_PACKAGE + "." + name
1036
- else :
1037
- result = name
1038
-
1039
- if is_library_by_path (result ):
1040
- return find_file_ex (result , base_dir , "Library" )
1041
-
1042
- return result
1024
+ return find_library (
1025
+ name ,
1026
+ str (self .root_folder ),
1027
+ base_dir ,
1028
+ self .get_resolvable_command_line_variables (),
1029
+ variables ,
1030
+ )
1043
1031
1044
1032
def _find_library_simple (
1045
1033
self ,
@@ -1077,17 +1065,14 @@ def __find_resource(
1077
1065
file_type : str = "Resource" ,
1078
1066
variables : Optional [Dict [str , Any ]] = None ,
1079
1067
) -> str :
1080
- if contains_variable (name , "$@&%" ):
1081
- return find_file (
1082
- name ,
1083
- str (self .root_folder ),
1084
- base_dir ,
1085
- self .get_resolvable_command_line_variables (),
1086
- variables ,
1087
- file_type ,
1088
- )
1089
-
1090
- return find_file_ex (name , base_dir , file_type )
1068
+ return find_file (
1069
+ name ,
1070
+ str (self .root_folder ),
1071
+ base_dir ,
1072
+ self .get_resolvable_command_line_variables (),
1073
+ variables ,
1074
+ file_type ,
1075
+ )
1091
1076
1092
1077
def __find_resource_simple (
1093
1078
self ,
@@ -1111,7 +1096,6 @@ def find_variables(
1111
1096
name ,
1112
1097
base_dir ,
1113
1098
variables ,
1114
- resolve_variables ,
1115
1099
resolve_command_line_vars ,
1116
1100
)
1117
1101
return self ._variables_files_cache .get (self .__find_variables_simple , name , base_dir )
@@ -1122,25 +1106,15 @@ def __find_variables(
1122
1106
name : str ,
1123
1107
base_dir : str ,
1124
1108
variables : Optional [Dict [str , Any ]] = None ,
1125
- resolve_variables : bool = True ,
1126
1109
resolve_command_line_vars : bool = True ,
1127
1110
) -> str :
1128
- if resolve_variables and contains_variable (name , "$@&%" ):
1129
- return find_variables (
1130
- name ,
1131
- str (self .root_folder ),
1132
- base_dir ,
1133
- self .get_resolvable_command_line_variables () if resolve_command_line_vars else None ,
1134
- variables ,
1135
- )
1136
-
1137
- if get_robot_version () >= (5 , 0 ):
1138
- if is_variables_by_path (name ):
1139
- return find_file_ex (name , base_dir , "Variables" )
1140
-
1141
- return name
1142
-
1143
- return find_file_ex (name , base_dir , "Variables" )
1111
+ return find_variables (
1112
+ name ,
1113
+ str (self .root_folder ),
1114
+ base_dir ,
1115
+ self .get_resolvable_command_line_variables () if resolve_command_line_vars else None ,
1116
+ variables ,
1117
+ )
1144
1118
1145
1119
@_logger .call
1146
1120
def __find_variables_simple (
@@ -1149,6 +1123,12 @@ def __find_variables_simple(
1149
1123
base_dir : str ,
1150
1124
) -> str :
1151
1125
1126
+ if get_robot_version () >= (5 , 0 ):
1127
+ if is_variables_by_path (name ):
1128
+ return find_file_ex (name , base_dir , "Variables" )
1129
+
1130
+ return name
1131
+
1152
1132
return find_file_ex (name , base_dir , "Variables" )
1153
1133
1154
1134
@property
0 commit comments