X-Git-Url: https://git.ralfj.de/dyn-nsupdate.git/blobdiff_plain/5395e7dcae4d4263e5d84845097757dec5518bbf..d711f3a81a328a3edc4b088923181d17a203910a:/client-scripts/dyn-ns-client?ds=sidebyside diff --git a/client-scripts/dyn-ns-client b/client-scripts/dyn-ns-client index 5006fbd..57c68e9 100755 --- a/client-scripts/dyn-ns-client +++ b/client-scripts/dyn-ns-client @@ -29,7 +29,7 @@ VERBOSE_CHANGE = 1 VERBOSE_FULL = 2 def sslContext(config): - if config['DEFAULT']['ssl_check_cert'].lower() in ('0', 'false', 'no'): + if config['DEFAULT'].get('ssl_check_cert', 'yes').lower() in ('0', 'false', 'no'): context = ssl.SSLContext(ssl.PROTOCOL_SSLv23) return context else: @@ -50,7 +50,10 @@ def getConfigDir(): return os.path.expanduser("~/.config/dyn-nsupdate") def urlopen(url, config): - return urllib.request.urlopen(url, context=sslContext(config)).read().decode('utf-8').strip() + if sys.version_info >= (3, 4, 3): + return urllib.request.urlopen(url, context=sslContext(config)).read().decode('utf-8').strip() + else: + return urllib.request.urlopen(url).read().decode('utf-8').strip() def getMyIP(family, config, methods = {}, verbose = 0): '''Returns our current IP address ( can be "IPv4" or "IPv6"), detected as given by the configuration.