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] put import at the top of the file

Browse source
This commit is contained in:
Laurent Peuch 2016-05-13 03:58:34 +02:00
parent 30bc046e1a
commit dabb9c9285
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/yunohost/domain.py
View file

@ -33,6 +33,10 @@ import requests
from moulinette.core import MoulinetteError
from yunohost.service import service_regenconf
from yunohost.hook import hook_callback
from yunohost.dyndns import dyndns_subscribe
def domain_list(auth, raw=False, filter=None, limit=None, offset=None):
"""
@ -77,8 +81,6 @@ def domain_add(auth, domain, dyndns=False):
dyndns -- Subscribe to DynDNS
"""
from yunohost.service import service_regenconf
from yunohost.hook import hook_callback
attr_dict = { 'objectClass' : ['mailDomain', 'top'] }
@ -89,7 +91,6 @@ def domain_add(auth, domain, dyndns=False):
if dyndns:
if len(domain.split('.')) < 3:
raise MoulinetteError(errno.EINVAL, m18n.n('domain_dyndns_invalid'))
from yunohost.dyndns import dyndns_subscribe
try:
r = requests.get('https://dyndns.yunohost.org/domains')
@ -178,9 +179,6 @@ def domain_remove(auth, domain, force=False):
force -- Force the domain removal
"""
from yunohost.service import service_regenconf
from yunohost.hook import hook_callback
if not force and domain not in domain_list(auth)['domains']:
raise MoulinetteError(errno.EINVAL, m18n.n('domain_unknown'))