fixed one relative import
Replacing all iteritems() by items() in tests etc to exclude dict ficer
after 2to3 and going manually over the diffs