fix unreachable code flagged by pylint
Merge pull request #46 from gurneyalex/8.0-fix_unreachable_code

fix unreachable code flagged by pylint
Merge remote-tracking branch 'upstream/8.0' into 8.0