Also catch `OSError` when deleting the data store.
Fix PEP-8 E302 and E202 error
Fix PEP-8 W291
Merge pull request #7588 from s0undt3ch/hotfix/lint

Some PEP8 Lint fixes