My understanding of http://www.python.org/dev/peps/pep-0328/ is that relative imports should work, so we can make these changes. But just to make sure: these commits are really coming from a Python2 branch, right?