migrate server scripts to python 3

diff --git a/server-scripts/checkip b/server-scripts/checkip
index d4eec23488ba429ae5d4d6312c866e97a29f5a13..55ff34369b96d6a8e2dffc8a18c6e8ca22a32cb7 100755 (executable)
--- a/server-scripts/checkip
+++ b/server-scripts/checkip
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python3

 # Copyright (c) 2014, Ralf Jung <post@ralfj.de>
 # All rights reserved.
 # 
 # Copyright (c) 2014, Ralf Jung <post@ralfj.de>
 # All rights reserved.
 # 


@@ -25,8 +25,8 @@
 import os
 
 # print headers
 import os
 
 # print headers

-print "Content-Type: text/plain"
-print ""
+print("Content-Type: text/plain")
+print("")

 
 # print content
 
 # print content

-print os.environ["REMOTE_ADDR"]
+print(os.environ["REMOTE_ADDR"])

diff --git a/server-scripts/update b/server-scripts/update
index 183f2dbd0c1c8a0af5e830216c6ee7199139323f..48c791caa2388fba70a8de087f45b48dd9cc6d1e 100755 (executable)
--- a/server-scripts/update
+++ b/server-scripts/update
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python3

 # Copyright (c) 2014, Ralf Jung <post@ralfj.de>
 # All rights reserved.
 # 
 # Copyright (c) 2014, Ralf Jung <post@ralfj.de>
 # All rights reserved.
 # 


@@ -26,12 +26,12 @@ import cgi, os, sys, subprocess
 form = cgi.FieldStorage(keep_blank_values=True)
 
 # print headers
 form = cgi.FieldStorage(keep_blank_values=True)
 
 # print headers

-print "Content-Type: text/plain"
-print ""
+print("Content-Type: text/plain")
+print("")

 
 # get input
 if "password" not in form or "domain" not in form or ("ip" not in form and "ipv6" not in form):
 
 # get input
 if "password" not in form or "domain" not in form or ("ip" not in form and "ipv6" not in form):

-    print "Mandatory argument missing: You must supply all of 'password', 'domain' and at least either 'ip' or 'ipv6'"
+    print("Mandatory argument missing: You must supply all of 'password', 'domain' and at least either 'ip' or 'ipv6'")

     sys.exit()
 
 domain = form.getfirst("domain")
     sys.exit()
 
 domain = form.getfirst("domain")


@@ -53,13 +53,13 @@ p = subprocess.Popen(args, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
 # check what it did
 if p.returncode or stderr or stdout:
     # error :/
 # 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
+    print("There was an error while updating the DNS: Return code %d" % p.returncode)
+    if stdout: print(stdout)
+    if stderr: print(stderr)

 else:
     out = "good"
     if ip is not None:
         out += " "+ip
     if ipv6 is not None:
         out += " "+ipv6
 else:
     out = "good"
     if ip is not None:
         out += " "+ip
     if ipv6 is not None:
         out += " "+ipv6

-    print out
+    print(out)