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

[mod] use requests everywhere

Browse source
This commit is contained in:
Laurent Peuch 2016-05-13 04:11:46 +02:00
parent 04929f4c84
commit 99f3ef96d3
1 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/yunohost/domain.py
View file

@ -29,8 +29,6 @@ import json
import yaml import yaml
import errno import errno
import shutil import shutil
from urllib import urlopen
import requests import requests
from moulinette.core import MoulinetteError from moulinette.core import MoulinetteError
@ -293,7 +291,7 @@ def get_public_ip(protocol=4):
else: else:
raise ValueError("invalid protocol version") raise ValueError("invalid protocol version")
try: try:
return urlopen(url).read().strip() return requests.get(url).content.strip()
except IOError: except IOError:
logger.debug('cannot retrieve public IPv%d' % protocol, exc_info=1) logger.debug('cannot retrieve public IPv%d' % protocol, exc_info=1)
raise MoulinetteError(errno.ENETUNREACH, raise MoulinetteError(errno.ENETUNREACH,