# HG changeset patch
# User Matt Johnston <matt@ucc.asn.au>
# Date 1562411455 -28800
# Node ID b0c0e88cbfcc317a06ca4f360360c3aebb47e370
# Parent  ca06059e76decd9a8db579db55a2a4514ea53658
fix merge, update requirements

diff -r ca06059e76de -r b0c0e88cbfcc py/gpio_rpi.py
--- a/py/gpio_rpi.py	Sat Jul 06 18:37:21 2019 +0800
+++ b/py/gpio_rpi.py	Sat Jul 06 19:10:55 2019 +0800
@@ -1,7 +1,5 @@
 import os
 
-import RPi.GPIO as GPIO
-
 from utils import L,D,EX,W
 
 __all__ = ["Gpio"]
diff -r ca06059e76de -r b0c0e88cbfcc py/requirements.txt
--- a/py/requirements.txt	Sat Jul 06 18:37:21 2019 +0800
+++ b/py/requirements.txt	Sat Jul 06 19:10:55 2019 +0800
@@ -1,9 +1,5 @@
-# sha256: nkIlLxfR3YnuMXReDE--WIYsJRR-sO9SlcnNm8tOosE
 lockfile==0.10.2
-
-# sha256: 2zFqD89UuXAsr2ymGbdr4l1T9e4Hgbr_C7ni4DVfryQ
-python-daemon==2.0.5
-
-# sha256: 6vR5rMmP_uCgKYgkZevyHzwwLhuUpBsWyKWmlbxhSQA
+python-daemon==2.2.3
 aiohttp==0.16.3
-
+chardet==2.3.0
+docutils==0.14
diff -r ca06059e76de -r b0c0e88cbfcc py/uploader.py
--- a/py/uploader.py	Sat Jul 06 18:37:21 2019 +0800
+++ b/py/uploader.py	Sat Jul 06 19:10:55 2019 +0800
@@ -64,7 +64,7 @@
     @asyncio.coroutine
     def do(self):
         try:
-        readings = self.server.take_readings()
+            readings = self.server.take_readings()
             tosend = self.get_tosend(readings)
             D("tosend >>>%s<<<" % str(tosend))
             nreadings = len(readings)