fix inconsistencies with urlparse lib

This commit is contained in:
Randall Leeds 2010-07-01 09:37:30 +08:00 committed by Benoit Chesneau
parent 5d9de13b59
commit 4e20f606f1
2 changed files with 5 additions and 5 deletions

View File

@ -168,7 +168,7 @@ class Request(Message):
# URI
self.uri = bits[1]
parts = urlparse.urlparse(bits[1])
self.scheme = parts.scheme or None
self.scheme = parts.scheme or ''
self.host = parts.netloc or None
if parts.port is None:
self.port = 80

View File

@ -19,7 +19,7 @@ random.seed()
def uri(data):
ret = {"raw": data}
parts = urlparse.urlparse(data)
ret["scheme"] = parts.scheme or None
ret["scheme"] = parts.scheme or ''
ret["host"] = parts.netloc.rsplit(":", 1)[0] or None
ret["port"] = parts.port or 80
if parts.path and parts.params:
@ -30,9 +30,9 @@ def uri(data):
# Don't think this can happen
ret["path"] = ";" + parts.path
else:
ret["path"] = None
ret["query"] = parts.query or None
ret["fragment"] = parts.fragment or None
ret["path"] = ''
ret["query"] = parts.query or ''
ret["fragment"] = parts.fragment or ''
return ret
def load_py(fname):