[fix] uses moulinette download_text utils

This commit is contained in:
Laurent Peuch 2018-06-30 14:39:31 +02:00
parent 43b10298fc
commit 834088551f

View file

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