Blind stab at updating for Python 3