[fix] Catch ConnectionError from requests package

This commit is contained in:
opi 2016-03-06 19:30:10 +01:00
parent 4a787da440
commit 0fb7295e8e

View file

@ -31,6 +31,7 @@ import shutil
import json import json
import yaml import yaml
import errno import errno
import requests
from urllib import urlopen from urllib import urlopen
from moulinette.core import MoulinetteError from moulinette.core import MoulinetteError
@ -95,12 +96,11 @@ def domain_add(auth, domain, dyndns=False):
if dyndns: if dyndns:
if len(domain.split('.')) < 3: if len(domain.split('.')) < 3:
raise MoulinetteError(errno.EINVAL, m18n.n('domain_dyndns_invalid')) raise MoulinetteError(errno.EINVAL, m18n.n('domain_dyndns_invalid'))
import requests
from yunohost.dyndns import dyndns_subscribe from yunohost.dyndns import dyndns_subscribe
try: try:
r = requests.get('https://dyndns.yunohost.org/domains') r = requests.get('https://dyndns.yunohost.org/domains')
except ConnectionError: except requests.ConnectionError:
pass pass
else: else:
dyndomains = json.loads(r.text) dyndomains = json.loads(r.text)