Revision 81db2abe
Gestion proxy : urlopen(url, data) en lieu et place de ProxyHandler
git-svn-id: https://vigilo-dev.si.c-s.fr/svn@2449 b22e2e97-25c9-44ff-b637-2e5ceca36478
vigigraph/controllers/nagiosproxy.py | ||
---|---|---|
20 | 20 |
|
21 | 21 |
#def _retrieve_content(self, url, values): |
22 | 22 |
def _retrieve_content(self, *args, **kwargs): |
23 |
''' Lecture du contenu Nagios à partir d'un dictionnaire de valeurs''' |
|
23 |
''' |
|
24 |
Lecture du contenu Nagios à partir d'un dictionnaire |
|
25 |
ce dictionnaire contient les arguments pour l url |
|
26 |
''' |
|
24 | 27 |
|
25 | 28 |
handle = None |
26 | 29 |
result = None |
... | ... | |
30 | 33 |
values = kwargs.get('values') |
31 | 34 |
if url is not None and values is not None: |
32 | 35 |
data = urllib.urlencode(values) |
33 |
proxy_handler = urllib2.ProxyHandler({'http': url}) |
|
34 |
opener = urllib2.build_opener(proxy_handler) |
|
35 | 36 |
try: |
36 |
handle = opener.open(url, data)
|
|
37 |
handle = urllib2.urlopen(url, data)
|
|
37 | 38 |
result = handle.read() |
38 | 39 |
except urllib2.URLError, e: |
39 | 40 |
raise |
40 | 41 |
finally: |
41 | 42 |
if handle: |
42 | 43 |
handle.close() |
43 |
|
|
44 |
|
|
44 | 45 |
return result |
45 | 46 |
|
46 | 47 |
|
Also available in: Unified diff