check Python version to configure SSL contexts

[dyn-nsupdate.git] / client-scripts / dyn-ns-client

diff --git a/client-scripts/dyn-ns-client b/client-scripts/dyn-ns-client
index 5006fbddc5c5d386373280e05ea708aa12af6e8b..57c68e92367415f3ba113cc97bf9324801ac8812 100755 (executable)
--- 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 (<family> can be "IPv4" or "IPv6"), detected as given by the configuration.