YunoHost/yunohost
1
0
Fork 0
mirror of https://github.com/YunoHost/yunohost.git synced 2024-09-03 20:06:10 +02:00
Code Issues Projects Releases Packages Wiki Activity

[fix] uses moulinette download_text utils

Browse source
This commit is contained in:
Laurent Peuch 2018-06-30 14:39:31 +02:00
parent 43b10298fc
commit 834088551f
1 changed files with 2 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/yunohost/utils/network.py
View file

@ -21,9 +21,7 @@
import logging import logging
import re import re
import subprocess import subprocess
import requests from moulinette.utils.network import download_text
from requests import ConnectionError
logger = logging.getLogger('yunohost.utils.network') logger = logging.getLogger('yunohost.utils.network')
@ -38,10 +36,7 @@ def get_public_ip(protocol=4):
else: else:
raise ValueError("invalid protocol version") raise ValueError("invalid protocol version")
try: return download_text(url, timeout=30).strip()
return requests.get(url, timeout=30).content.strip()
except ConnectionError:
return None
def get_network_interfaces(): def get_network_interfaces():