Skip to content

Commit

Permalink
pylint: C0206 Consider iterating with .items()
Browse files Browse the repository at this point in the history
  • Loading branch information
pavelliavonau committed Sep 28, 2021
1 parent 0c9ab6b commit f4a655b
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 9 deletions.
8 changes: 4 additions & 4 deletions cmake_converter/context.py
Original file line number Diff line number Diff line change
Expand Up @@ -129,14 +129,14 @@ def init(self, source_project_path, cmake_lists_destination_dir):
)
return False

for sln_config in self.sln_configurations_map:
self.configurations_to_parse.add(self.sln_configurations_map[sln_config])
for _, proj_config in self.sln_configurations_map.items():
self.configurations_to_parse.add(proj_config)

context_initializer_map = self.get_project_initialization_dict()

for key in context_initializer_map:
for key, initializer in context_initializer_map.items():
if key in source_project_path:
context_initializer_map[key]()
initializer()
self.project_name = os.path.basename(os.path.splitext(source_project_path)[0])
self.vcxproj_path = source_project_path
self.set_cmake_lists_path(cmake_lists_destination_dir)
Expand Down
3 changes: 1 addition & 2 deletions cmake_converter/data_converter.py
Original file line number Diff line number Diff line change
Expand Up @@ -159,8 +159,7 @@ def merge_data_settings(self, context):
set_of_items
)

for arch in merged_settings:
merged_setting = merged_settings[arch]
for arch, merged_setting in merged_settings.items():
context.settings[(None, arch)][key] = merged_setting
context.sln_configurations_map[(None, arch)] = (None, arch)

Expand Down
6 changes: 3 additions & 3 deletions cmake_converter/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -263,9 +263,9 @@ def make_os_specific_shell_path(output):
'$(OutDir)': '${OUTPUT_DIRECTORY}',
'$(TargetPath)': '$<TARGET_FILE:${PROJECT_NAME}>',
}
for var in variables_to_replace:
if var in output:
output = output.replace(var, '$<SHELL_PATH:{}>'.format(variables_to_replace[var]))
for sln_var, cmake_var in variables_to_replace.items():
if sln_var in output:
output = output.replace(sln_var, '$<SHELL_PATH:{}>'.format(cmake_var))

return output

Expand Down

0 comments on commit f4a655b

Please sign in to comment.