Don't import urlparse from six, just import directly from urllib.

We don't currently support Python 3, and we use urllib2 in other
parts of the code anyway.

This fixes Travis following removing our six monkeypatches, because
urlparse actually lives in a different place on six (and we don't
yet support such new six versions).