From: Ralf Jung Date: Thu, 9 Oct 2014 12:58:07 +0000 (+0200) Subject: Convert Python scripts to be more PEP8-like X-Git-Url: https://git.ralfj.de/dyn-nsupdate.git/commitdiff_plain/9ea63288e65a4da36f902d49d534db12cbf0c520 Convert Python scripts to be more PEP8-like --- diff --git a/client-scripts/dyn-ns-client b/client-scripts/dyn-ns-client index 4493e11..d8f75b8 100755 --- a/client-scripts/dyn-ns-client +++ b/client-scripts/dyn-ns-client @@ -35,32 +35,32 @@ password = 'yourpassword' # END of configuration variables def urlopen(url): - return urllib.request.urlopen(url).read().decode('utf-8').strip() + return urllib.request.urlopen(url).read().decode('utf-8').strip() myip = urlopen('https://'+server+'/checkip') def update_domain(domain): - '''Update the given domain, using the global server, user, password. Returns True on success, False on failure.''' - global myip - # check if the domain is already mapped to our current IP - domainip = socket.gethostbyname(domain) - if myip == domainip: - # nothing to do - return True + '''Update the given domain, using the global server, user, password. Returns True on success, False on failure.''' + global myip + # check if the domain is already mapped to our current IP + domainip = socket.gethostbyname(domain) + if myip == domainip: + # nothing to do + return True - # we need to update the IP - result = urlopen('https://'+server+'/update?password='+urllib.parse.quote(password)+'&domain='+urllib.parse.quote(domain)+'&ip='+urllib.parse.quote(myip)) - if 'good '+myip == result: - # all went all right - return True - else: - # Something went wrong - print("Unexpected answer from server",server,"while updating",domain,"to",myip) - print(result) - return False + # we need to update the IP + result = urlopen('https://'+server+'/update?password='+urllib.parse.quote(password)+'&domain='+urllib.parse.quote(domain)+'&ip='+urllib.parse.quote(myip)) + if 'good '+myip == result: + # all went all right + return True + else: + # Something went wrong + print("Unexpected answer from server",server,"while updating",domain,"to",myip) + print(result) + return False exitcode = 0 for domain in domains: - if not update_domain(domain): - exitcode = 1 + if not update_domain(domain): + exitcode = 1 sys.exit(exitcode) diff --git a/server-scripts/update b/server-scripts/update index 3b3ab53..3d6331e 100755 --- a/server-scripts/update +++ b/server-scripts/update @@ -48,9 +48,9 @@ p = subprocess.Popen(["/var/lib/named/dyn-nsupdate", domain, password, ip], stdo # check what it did if p.returncode or stderr or stdout: - # error :/ - print "There was an error while updating the DNS: Return code %d" % p.returncode - if stdout: print stdout - if stderr: print stderr + # error :/ + print "There was an error while updating the DNS: Return code %d" % p.returncode + if stdout: print stdout + if stderr: print stderr else: - print "good",ip + print "good",ip