Issue #16706: get rid of os.error
33 files changed