Convert Python scripts to be more PEP8-like

diff --git a/client-scripts/dyn-ns-client b/client-scripts/dyn-ns-client
index 4493e115350b7c611afc18c3a3c8364fd65b9ec3..d8f75b8f952f9f263ce11a3290a31b8a06113158 100755 (executable)
--- 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):
 # 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):
 
 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:
 
 exitcode = 0
 for domain in domains:

-       if not update_domain(domain):
-               exitcode = 1
+    if not update_domain(domain):
+        exitcode = 1

 sys.exit(exitcode)
 sys.exit(exitcode)

diff --git a/server-scripts/update b/server-scripts/update
index 3b3ab5308ee35cf208eb6b27df60d2feb277d0a2..3d6331eacc9f52187839aa20e9b40d7a7f073d56 100755 (executable)
--- 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:
 
 # 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:
 else:

-       print "good",ip
+    print "good",ip