From: Ralf Jung <post@ralfj.de>
Date: Sun, 11 May 2014 17:30:08 +0000 (+0200)
Subject: port client script to python 3
X-Git-Url: https://git.ralfj.de/dyn-nsupdate.git/commitdiff_plain/4c50ee5d8b2eb10d1fa5a1c8ec340fb769614ffd

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 e556ab7..6af3934 100755
--- 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'
-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
 
-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.'''
@@ -19,14 +22,14 @@ def update_domain(domain):
 		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
-		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
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