port client script to python 3

diff --git a/client.py b/client-scripts/dyn-ns-client
similarity index 57%
rename from client.py
rename to client-scripts/dyn-ns-client
index e556ab7f4bd5f4582768f118cb7d82839b5e533b..6af3934799f83a529950b10912ed74f3ab84c21f 100755 (executable)
--- a/client.py
+++ b/client-scripts/dyn-ns-client
@@ -1,13 +1,16 @@
-#!/usr/bin/python
-import urllib2, socket, urllib, sys
+#!/usr/bin/python3
+import urllib.request, socket, sys

 
 # configuration variables
 server = 'ns.ralfj.de'
 
 # configuration variables
 server = 'ns.ralfj.de'

-domains = ['your.domain.ralfj.de'] # list of domains to update
+domains = ['domain.dyn.ralfj.de'] # list of domains to update

 password = 'yourpassword'
 # END of configuration variables
 
 password = 'yourpassword'
 # END of configuration variables
 

-myip = urllib2.urlopen('https://'+server+'/checkip').read().strip()
+def urlopen(url):
+       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.'''
 
 def update_domain(domain):
        '''Update the given domain, using the global server, user, password. Returns True on success, False on failure.'''


@@ -19,14 +22,14 @@ def update_domain(domain):
                return True
 
        # we need to update the IP
                return True
 
        # we need to update the IP

-       result = urllib2.urlopen('https://'+server+'/update?password='+urllib.quote(password)+'&domain='+urllib.quote(domain)+'&ip='+urllib.quote(myip)).read().strip()
+       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
        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
+               print("Unexpected answer from server",server,"while updating",domain,"to",myip)
+               print(result)

                return False
 
 exitcode = 0
                return False
 
 exitcode = 0

diff --git a/checkip b/server-scripts/checkip
similarity index 100%
rename from checkip
rename to server-scripts/checkip

diff --git a/update b/server-scripts/update
similarity index 100%
rename from update
rename to server-scripts/update