merge urlparse.urlparse() fix into 1.4 branch