[PATCH 0 of 2] test-url cleanup and fix for Py < 2.6

[Augie Fackler]

First patch is trailing whitespace cleanup, I don't feel strongly, but
it seemed reasonable to me. Second patch fixes a failure mpm and I
both see on Python < 2.6.