Use shutil.which instead of sh.which
#2637
Merged
shutil.which instead of sh.which
#2637