Revert "use Jython compatible syntax (v2.5)"

This reverts commit 44ae86de8bee238f37364594cbb1706b16f1b598 as we require
Python 2.7 now anyways.
Revert "Use Jython compatible syntax (v2.5)."

This reverts commit 2a49acba45046a4db8418a46e5cedb48b4ba1e7f as we require
Python 2.7 now anyways.