This reverts commit 751ddeea.

autopep8 -a -r -i --select E711,E712,W601,W602,W603,W604,W690,E304,E401,E502 .
Also includes some manual reindentations (many are left after the print()
changes).
Manually checked, some modernizations not commited here.

python modernize.py --no-six -f libmodernize.fixes.fix_print -w

With manual fixes as the import was put always on top.

Laurent Bachelier authored Dec 04, 2013 and Romain Bignon committed Dec 10, 2013

refs #1299