Apply fixes to s3:// URL parsing under Python 2.6.