From 21b67ee7d00c3543c088150e93511a3513fcca90 Mon Sep 17 00:00:00 2001 From: Laurent Peuch Date: Sun, 1 Nov 2015 13:00:06 +0100 Subject: [PATCH 1/2] [mod] remove useless imports --- src/yunohost/dyndns.py | 1 - 1 file changed, 1 deletion(-) diff --git a/src/yunohost/dyndns.py b/src/yunohost/dyndns.py index b4eb376dd..acc1df54a 100644 --- a/src/yunohost/dyndns.py +++ b/src/yunohost/dyndns.py @@ -24,7 +24,6 @@ Subscribe and Update DynDNS Hosts """ import os -import sys import requests import re import json From 2d88ab9a248e15c88dae64ecff976c5481ee2d2a Mon Sep 17 00:00:00 2001 From: Laurent Peuch Date: Sun, 1 Nov 2015 13:00:15 +0100 Subject: [PATCH 2/2] [fix] unreferenced exceptions --- src/yunohost/dyndns.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/yunohost/dyndns.py b/src/yunohost/dyndns.py index acc1df54a..e1d0afd40 100644 --- a/src/yunohost/dyndns.py +++ b/src/yunohost/dyndns.py @@ -96,7 +96,7 @@ def dyndns_subscribe(subscribe_host="dyndns.yunohost.org", domain=None, key=None # Send subscription try: r = requests.post('https://%s/key/%s' % (subscribe_host, base64.b64encode(key)), data={ 'subdomain': domain }) - except ConnectionError: + except requests.ConnectionError: raise MoulinetteError(errno.ENETUNREACH, m18n.n('no_internet_connection')) if r.status_code != 201: try: error = json.loads(r.text)['error'] @@ -129,7 +129,7 @@ def dyndns_update(dyn_host="dynhost.yunohost.org", domain=None, key=None, ip=Non if ip is None: try: new_ip = requests.get('http://ip.yunohost.org').text - except ConnectionError: + except requests.ConnectionError: raise MoulinetteError(errno.ENETUNREACH, m18n.n('no_internet_connection')) else: new_ip = ip