# HG changeset patch
# User Matt Johnston <matt@ucc.asn.au>
# Date 1428682565 -28800
# Node ID e39ed85d87a59cda18142c17e003a450aecb24f2
# Parent  185621f47040ee1da67f92844634b5313b526d20
fix a few python3 issues

diff -r 185621f47040 -r e39ed85d87a5 py/gpio_test.py
--- a/py/gpio_test.py	Fri Apr 10 23:59:16 2015 +0800
+++ b/py/gpio_test.py	Sat Apr 11 00:16:05 2015 +0800
@@ -14,7 +14,7 @@
 	def turn(self, value):
 		self.state = bool(value)
 		onoff = ("off", "on")[int(self.state)]
-		L("Test GPIO %s pin %d turned %s" % (self.name, self.pin, onoff))
+		L("Test GPIO %s pin %s turned %s" % (self.name, self.pin, onoff))
 
 	def get_state(self):
 		return self.state
diff -r 185621f47040 -r e39ed85d87a5 py/params.py
--- a/py/params.py	Fri Apr 10 23:59:16 2015 +0800
+++ b/py/params.py	Sat Apr 11 00:16:05 2015 +0800
@@ -36,7 +36,7 @@
     def load(self, f = None):
         if not f:
             try:
-                f = file(config.PARAMS_FILE, 'r')
+                f = open(config.PARAMS_FILE, 'r')
             except IOError as e:
                 W("Missing parameter file, using defaults. %s", e)
                 return
diff -r 185621f47040 -r e39ed85d87a5 py/tempserver.py
--- a/py/tempserver.py	Fri Apr 10 23:59:16 2015 +0800
+++ b/py/tempserver.py	Sat Apr 11 00:16:05 2015 +0800
@@ -14,7 +14,7 @@
 from utils import L,D,EX,W
 import fridge
 import config
-import sensor_ds18b20
+import sensor
 import params
 import uploader
 
diff -r 185621f47040 -r e39ed85d87a5 py/uploader.py
--- a/py/uploader.py	Fri Apr 10 23:59:16 2015 +0800
+++ b/py/uploader.py	Sat Apr 11 00:16:05 2015 +0800
@@ -44,8 +44,8 @@
     @asyncio.coroutine
     def send(self, tosend):
         js = json.dumps(tosend)
-        js_enc = binascii.b2a_base64(zlib.compress(js))
-        mac = hmac.new(config.HMAC_KEY, js_enc).hexdigest()
+        js_enc = binascii.b2a_base64(zlib.compress(js.encode()))
+        mac = hmac.new(config.HMAC_KEY.encode(), js_enc).hexdigest()
         send_data = {'data': js_enc, 'hmac': mac}
         r = yield from asyncio.wait_for(aiohttp.request('post', config.UPDATE_URL, data=send_data), 60)
         result = yield from asyncio.wait_for(r.text(), 60)
@@ -62,7 +62,7 @@
             readings = None
             D("Sent updated %d readings" % nreadings)
         except Exception as e:
-            EX("Error in uploader: %s" % str(e))
+            E("Error in uploader: %s" % str(e))
         finally:
             if readings is not None:
                 self.server.pushfront(readings)