Allow to run with python3

code/python/package/README.txt

@@ -7,25 +7,25 @@ This directory contains the installation scripts and the PiModules(R) Python pac
 Installation
 ------------
 
-First you need to install a couple of Python dependencies.  Install python-pip like this:
+First you need to install a couple of Python dependencies.  Install python3-pip like this:
 
-	sudo apt-get install python-pip
+	sudo apt-get install python3-pip
 
 Then install both `jinja2` and `xmltodict` like this:
 
-	sudo pip install jinja2
-	sudo pip install xmltodict
+	sudo pip3 install jinja2
+	sudo pip3 install xmltodict
 
-Both of the above libraries are used in the sending of email alerts by the file-safe shutdown 
+Both of the above libraries are used in the sending of email alerts by the file-safe shutdown
 daemon.
 
 Now install the pimodules package:
 
-	sudo python setup.py install
+	sudo python3 setup.py install
 
 You can record what files are installed by the above process by running it like this:
 
-	sudo python setup.py install --record <filename>
+	sudo python3 setup.py install --record <filename>
 
 Where <filename> will be a text file containing one line per file installed by the process.
 
@@ -68,6 +68,3 @@ This file.
 * setup.py
 
 Installation file, see `README.md` in the directory above this one.
-
-
-

code/python/package/pimodules/alerts.py

@@ -8,78 +8,78 @@
 
 
 def get_host_name():
-	try:
-		command = "uname -n"
-		process = subprocess.Popen(command.split(), stdout=subprocess.PIPE)
-		output = process.communicate()[0]
-		return output
-	except:
-		return None
+    try:
+        command = "uname -n"
+        process = subprocess.Popen(command.split(), stdout=subprocess.PIPE)
+        output = process.communicate()[0]
+        return output
+    except:
+        return None
 
 
 def get_ip_address():
-	try:
-		command = "hostname -I"
-		process = subprocess.Popen(command.split(), stdout=subprocess.PIPE)
-		output = process.communicate()[0]
-		return output
-	except:
-		return None
-
-
-def sendEmail( emailserver, username, port, security, fromAddr, toAddr, b64Password, msgSubjectTemplate, msgBodyTemplate):
-	try:
-		port = int(port)
-	except ValueError:
-		port = 0
-
-	try:
-		now = datetime.datetime.now()
-		host = get_host_name()
-		ipaddress = get_ip_address()
-	except:
-		raise
-
-	password = base64.b64decode(b64Password)
-
-	tVars= { 'now' : now, 'host' : host, 'ipaddress' : ipaddress }
-
-	try:
-		templateLoader = jinja2.FileSystemLoader(searchpath="/")
-		templateEnv = jinja2.Environment( loader=templateLoader )
-
-		subjectTemplate = templateEnv.get_template(msgSubjectTemplate)
-		bodyTemplate = templateEnv.get_template(msgBodyTemplate)
-
-		msgSubject = subjectTemplate.render(tVars)
-		msgBody = bodyTemplate.render(tVars)
-
-	except:
-		raise
-
-	# Writing the message
-	msg = MIMEText(msgBody)
-	msg['Subject'] = msgSubject
-	msg['From'] = fromAddr
-	msg['To'] = toAddr
-
-	# Sending the message
-	try:
-		if port:
-			serverstring = format("%s:%d" % (emailserver, port))
-		else:
-			serverstring = emailserver
-
-		if security.lower() in ['ssl']:
-			server = smtplib.SMTP_SSL(serverstring)
-		else:
-			server = smtplib.SMTP(serverstring)
-			server.starttls()
-
-		server.login(username, password)
-		server.sendmail(fromAddr, [toAddr], msg.as_string())
-		server.quit()
-	except:
-		raise
-
-	return True
+    try:
+        command = "hostname -I"
+        process = subprocess.Popen(command.split(), stdout=subprocess.PIPE)
+        output = process.communicate()[0]
+        return output
+    except:
+        return None
+
+
+def sendEmail(emailserver, username, port, security, fromAddr, toAddr, b64Password, msgSubjectTemplate, msgBodyTemplate):
+    try:
+        port = int(port)
+    except ValueError:
+        port = 0
+
+    try:
+        now = datetime.datetime.now()
+        host = get_host_name().decode('utf-8')
+        ipaddress = get_ip_address()
+    except:
+        raise
+
+    password = base64.b64decode(b64Password).decode('utf-8')
+
+    tVars = {'now': now, 'host': host, 'ipaddress': ipaddress}
+
+    try:
+        templateLoader = jinja2.FileSystemLoader(searchpath="/")
+        templateEnv = jinja2.Environment(loader=templateLoader)
+
+        subjectTemplate = templateEnv.get_template(msgSubjectTemplate)
+        bodyTemplate = templateEnv.get_template(msgBodyTemplate)
+
+        msgSubject = subjectTemplate.render(tVars)
+        msgBody = bodyTemplate.render(tVars)
+
+    except:
+        raise
+
+    # Writing the message
+    msg = MIMEText(msgBody)
+    msg['Subject'] = msgSubject
+    msg['From'] = fromAddr
+    msg['To'] = toAddr
+
+    # Sending the message
+    try:
+        if port:
+            serverstring = format("%s:%d" % (emailserver, port))
+        else:
+            serverstring = emailserver
+
+        if security.lower() in ['ssl']:
+            server = smtplib.SMTP_SSL(serverstring)
+        else:
+            server = smtplib.SMTP(serverstring)
+            server.starttls()
+
+        server.login(username, password)
+        server.sendmail(fromAddr, [toAddr], msg.as_string())
+        server.quit()
+    except:
+        raise
+
+    return True

code/python/package/pimodules/configuration.py

@@ -41,9 +41,7 @@ def write_config_xml(xmlfile, dict):
 	        with open(xmlfile, "wt") as fo:
 	                xmltodict.unparse(dict, fo, pretty=True)
 	except IOError as e:
-		print "Error writing XML file: ", e
+		print("Error writing XML file: "+e)
 		return False
 
 	return True
-
-