nicolargo/glances
1
1
Fork 0
mirror of https://github.com/nicolargo/glances.git synced 2024-11-28 22:55:55 +03:00
Code Issues Projects Releases Wiki Activity

Correct an issue on IP public with Python 3 (issue #646)

Browse Source
This commit is contained in:
nicolargo 2016-04-02 16:59:44 +02:00
parent 33d01bf586
commit 9260c953a8
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
glances/plugins/glances_ip.py
View File

@ -19,11 +19,10 @@
"""IP plugin.""" """IP plugin."""
import Queue
import threading import threading
from json import load from json import loads
from glances.compat import iterkeys, urlopen, URLError from glances.compat import iterkeys, urlopen, URLError, queue
from glances.globals import BSD from glances.globals import BSD
from glances.logger import logger from glances.logger import logger
from glances.timer import Timer from glances.timer import Timer
@ -160,7 +159,7 @@ class PublicIpAddress(object):
def get(self): def get(self):
"""Get the first public IP address returned by one of the online services""" """Get the first public IP address returned by one of the online services"""
q = Queue.Queue() q = queue.Queue()
for u, j, k in urls: for u, j, k in urls:
t = threading.Thread(target=self._get_ip_public, args=(q, u, j, k)) t = threading.Thread(target=self._get_ip_public, args=(q, u, j, k))
@ -175,15 +174,15 @@ class PublicIpAddress(object):
return ip return ip
def _get_ip_public(self, queue, url, json=False, key=None): def _get_ip_public(self, queue_target, url, json=False, key=None):
"""Request the url service and put the result in the queue""" """Request the url service and put the result in the queue_target"""
try: try:
u = urlopen(url, timeout=self.timeout) response = urlopen(url, timeout=self.timeout).read().decode('utf-8')
except URLError: except URLError:
queue.put(None) queue_target.put(None)
else: else:
# Request depend on service # Request depend on service
if not json: if not json:
queue.put(u.read()) queue_target.put(response)
else: else:
queue.put(load(u)[key]) queue_target.put(loads(response)[key])