Support only Python2 currently; but fix octal literals for forward compatibility