Python 3 compatibility and flake8#111

Merged

emiliom merged 2 commits intoODM2:masterfrom

Oct 18, 2017

Commits on Oct 5, 2017

Python 3 compat and flake8
ocefpaf
committed

Commits on Oct 11, 2017

Merge branch 'master' into py3k
ocefpaf
authored