mirror of
https://github.com/Mikaela/Limnoria.git
synced 2025-01-11 20:52:42 +01:00
Fix commit f4b81659
.
This commit is contained in:
parent
c83481bd9c
commit
a274f25bb8
@ -503,18 +503,18 @@ def open_http(url, data=None):
|
|||||||
# check whether the proxy contains authorization information
|
# check whether the proxy contains authorization information
|
||||||
proxy_passwd, host = urllib.splituser(host)
|
proxy_passwd, host = urllib.splituser(host)
|
||||||
# now we proceed with the url we want to obtain
|
# now we proceed with the url we want to obtain
|
||||||
urltype, rest = splittype(selector)
|
urltype, rest = urllib.splittype(selector)
|
||||||
url = rest
|
url = rest
|
||||||
user_passwd = None
|
user_passwd = None
|
||||||
if urltype.lower() != 'http':
|
if urltype.lower() != 'http':
|
||||||
realhost = None
|
realhost = None
|
||||||
else:
|
else:
|
||||||
realhost, rest = splithost(rest)
|
realhost, rest = urllib.splithost(rest)
|
||||||
if realhost:
|
if realhost:
|
||||||
user_passwd, realhost = urllib.splituser(realhost)
|
user_passwd, realhost = urllib.splituser(realhost)
|
||||||
if user_passwd:
|
if user_passwd:
|
||||||
selector = "%s://%s%s" % (urltype, realhost, rest)
|
selector = "%s://%s%s" % (urltype, realhost, rest)
|
||||||
if proxy_bypass(realhost):
|
if urllib.proxy_bypass(realhost):
|
||||||
host = realhost
|
host = realhost
|
||||||
|
|
||||||
#print "proxy via http:", host, selector
|
#print "proxy via http:", host, selector
|
||||||
|
@ -1,3 +1,3 @@
|
|||||||
"""stick the various versioning attributes in here, so we only have to change
|
"""stick the various versioning attributes in here, so we only have to change
|
||||||
them once."""
|
them once."""
|
||||||
version = '0.83.4.1+limnoria (2012-05-02T19:06:22+0000)'
|
version = '0.83.4.1+limnoria (2012-05-02T19:13:09+0000)'
|
||||||
|
Loading…
Reference in New Issue
Block a user