nojhan/weboob-devel
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

use urlparse to parse proxy url

Browse source
This commit is contained in:
Romain Bignon 2012-03-14 19:44:46 +01:00
commit 98968d50d1
1 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
weboob/tools/browser/browser.py
View file

@ -31,6 +31,7 @@ from threading import RLock
import time import time
import urllib import urllib
import urllib2 import urllib2
from urlparse import urlsplit
import mimetypes import mimetypes
from contextlib import closing from contextlib import closing
from gzip import GzipFile from gzip import GzipFile
@ -181,8 +182,10 @@ class StandardBrowser(mechanize.Browser):
self.proxy = proxy self.proxy = proxy
if proxy: if proxy:
proto = 'http' proto = 'http'
if proxy.find('://') >= 0: if '://' in proxy:
proto, domain = proxy.split('://', 1) v = urlsplit(proxy)
proto = v.scheme
domain = v.netloc
else: else:
domain = proxy domain = proxy
self.set_proxies({proto: domain}) self.set_proxies({proto: domain})