Commit 3a918941 authored by Thomas Vincent's avatar Thomas Vincent

iattr/variable duplicate

parent 4d687d6f
......@@ -208,8 +208,8 @@ class KmapMerger(object):
if blocking:
self.__run_merge()
else:
thread = self.__thread = Thread(target=self.__run_merge)
thread.start()
self.__thread = Thread(target=self.__run_merge)
self.__thread.start()
def __run_merge(self):
"""Runs the merge."""
......@@ -284,7 +284,6 @@ class KmapMerger(object):
self.__proc_indices[scan_id] = proc_idx
pool.close()
pool.join()
proc_results = [result.get() for result in results.values()]
......@@ -325,10 +324,7 @@ class KmapMerger(object):
return self.__results
def wait(self):
"""
Waits until parsing is done, or returns if it is not running.
:return:
"""
"""Waits until parsing is done, or returns if it is not running."""
if self.__thread:
self.__thread.join()
......@@ -370,7 +366,6 @@ class KmapMerger(object):
self.__selected_ids |= scan_ids
def unselect(self, scan_ids):
if scan_ids is None:
return
......@@ -437,9 +432,7 @@ class KmapMerger(object):
return exist
def check_consistency(self):
"""
Checks if all selected scans have the same command.
"""
"""Checks if all selected scans have the same command."""
errors = []
scan_ids = self.selected_ids
n_scans = len(scan_ids)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment