Some fixes on YCC and Networking module
This commit is contained in:
parent
22da70ac39
commit
1693488a56
2 changed files with 10 additions and 6 deletions
|
|
@ -57,6 +57,10 @@ def traceURL(url, timeout=5, stack=None):
|
|||
stack = list()
|
||||
stack.append(url)
|
||||
|
||||
if len(stack) > 15:
|
||||
stack.append('stack overflow :(')
|
||||
return stack
|
||||
|
||||
o = urlparse(url, "http")
|
||||
if o.netloc == "":
|
||||
return stack
|
||||
|
|
@ -72,12 +76,12 @@ def traceURL(url, timeout=5, stack=None):
|
|||
except socket.gaierror:
|
||||
print ("<tools.web> Unable to receive page %s from %s on %d."
|
||||
% (o.path, o.netloc, o.port))
|
||||
return None
|
||||
return stack
|
||||
|
||||
try:
|
||||
res = conn.getresponse()
|
||||
except http.client.BadStatusLine:
|
||||
return None
|
||||
return stack
|
||||
finally:
|
||||
conn.close()
|
||||
|
||||
|
|
@ -86,9 +90,9 @@ def traceURL(url, timeout=5, stack=None):
|
|||
elif res.status == http.client.FOUND or res.status == http.client.MOVED_PERMANENTLY or res.status == http.client.SEE_OTHER:
|
||||
url = res.getheader("Location")
|
||||
if url in stack:
|
||||
stack.append(url)
|
||||
stack.append("loop on " + url)
|
||||
return stack
|
||||
else:
|
||||
return traceURL(url, timeout, stack)
|
||||
else:
|
||||
return None
|
||||
return stack
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue