test-python26-compat: make test python 2.6 compatible.
Merge branch 'test-python26-compat'