Update hacking for Python3

The repo is Python 3 now but still tests some older
branches, so update hacking to version 2.0 which
supports Python 2 and 3.

Fix problems found.

Change-Id: I54f1fa0ee72499a740e630bbd3478427babc2ec2
2 files changed