kill a spurrious xrange from tests
switch datastructures to direct imports from six
fix a ordered multidict testcase
use detailed assertions in the datastructures testcase
Fixed urlopen import in testsuite.serving
Moved some stuff to werkzeug._compat
Fixed contrib.cache
More naive changes?