X-Git-Url: https://git.ralfj.de/dyn-nsupdate.git/blobdiff_plain/a163f82aa9483c77caf55cf9c857051254306eed..b83cce8231332251a6bbcefb24330a87cee9ebff:/client-scripts/dyn-ns-client?ds=inline diff --git a/client-scripts/dyn-ns-client b/client-scripts/dyn-ns-client index 78a6854..88d9220 100755 --- a/client-scripts/dyn-ns-client +++ b/client-scripts/dyn-ns-client @@ -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. @@ -140,9 +143,9 @@ def updateDomain(server, domain, ipv4, ipv6, password, config, verbose): if verbose >= VERBOSE_CHANGE: msg = "Successfully updated domain {} on {}:".format(domain, server) if ipv4 is not None: - msg += " IPv4={}".format(ipv4) + msg += " IPv4={} -> {}".format(curIPv4, ipv4) if ipv6 is not None: - msg += " IPv6={}".format(ipv6) + msg += " IPv6={} -> {}".format(curIPv6, ipv6) print(msg) # all went all right return True @@ -159,7 +162,7 @@ if __name__ == "__main__": dest="config", default=os.path.join(getConfigDir(), "dyn-ns-client.conf"), help="The configuration file") parser.add_argument("-v", "--verbose", - action="count", dest="verbose", + action="count", dest="verbose", default=0, help="Be more verbose") args = parser.parse_args()