[wip] Python 3#762

erkie wants to merge 3 commits into

python-diamond:masterpython-diamond/Diamond:masterfrom

feederco:masterfeederco/Diamond:masterCopy head branch name to clipboard