Mercurial > code > home > repos > homeauto
diff service/piNode/piNode.py @ 636:7c04b4f675ec
piNode to py3
Ignore-this: c04a6b87bb776997781404c7e76898d4
author | drewp@bigasterisk.com |
---|---|
date | Mon, 12 Aug 2019 10:07:49 -0700 |
parents | accbbd521ecd |
children | ad1756af9d99 |
line wrap: on
line diff
--- a/service/piNode/piNode.py Mon Aug 12 02:23:15 2019 -0700 +++ b/service/piNode/piNode.py Mon Aug 12 10:07:49 2019 -0700 @@ -1,19 +1,17 @@ -from __future__ import division -import sys, logging, socket, json, time, pkg_resources +import logging, socket, json, time, pkg_resources import cyclone.web from cyclone.httpclient import fetch from rdflib import Namespace, URIRef, Literal, Graph, RDF, ConjunctiveGraph from rdflib.parser import StringInputSource -from twisted.internet import reactor, task -from twisted.internet.defer import inlineCallbacks, maybeDeferred, gatherResults, returnValue +from twisted.internet import reactor +from twisted.internet.defer import inlineCallbacks, maybeDeferred, returnValue from twisted.internet.threads import deferToThread from docopt import docopt -from typing import Any -import etcd3 # type: Any +import etcd3 from greplin import scales from greplin.scales.cyclonehandler import StatsHandler - -logging.basicConfig(level=logging.DEBUG) +import pigpio +import treq from patchablegraph import PatchableGraph, CycloneGraphHandler, CycloneGraphEventsHandler from cycloneerr import PrettyErrorHandler @@ -151,6 +149,7 @@ self.graph, self.uri = graph, uri self.hubHost = hubHost self.masterGraph = masterGraph + self.masterGraph.setToGraph(self.staticStmts()) self.pi = pigpio.pi() self._devs = [DeviceRunner(d) for d in devices.makeDevices(graph, self.uri, self.pi)] @@ -296,10 +295,10 @@ else: g = rdfGraphBody(self.request.body, self.request.headers) assert len(g) == 1, len(g) - stmt = g.triples((None, None, None)).next() + stmt = next(g.triples((None, None, None))) for b in self.settings.config.boards: - b.outputStatements([stmt]) + b.outputStatements({stmt}) class Boards(PrettyErrorHandler, cyclone.web.RequestHandler): def get(self): @@ -327,7 +326,7 @@ if arg['--ow']: log.setLevel(logging.INFO) for stmt in devices.OneWire().poll(): - print stmt + print(stmt) return masterGraph = PatchableGraph()