Mercurial > code > home > repos > homeauto
changeset 1560:c3d699b5759c
more py3 fixes
Ignore-this: f212b4a5edf8e599e9efd70bc65e7651
darcs-hash:d944ca9d7d7b36c2c02529dcf9225a99c0aa1831
| author | drewp <drewp@bigasterisk.com> |
|---|---|
| date | Fri, 14 Feb 2020 00:33:31 -0800 |
| parents | 6047a660ef76 |
| children | fc45f01f66c2 c2ed44ed1e3c 71eec31da919 |
| files | service/reasoning/actions.py service/reasoning/httpputoutputs.py service/reasoning/rdflibtrig.py service/reasoning/reasoning.py |
| diffstat | 4 files changed, 14 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/service/reasoning/actions.py Fri Feb 14 00:33:14 2020 -0800 +++ b/service/reasoning/actions.py Fri Feb 14 00:33:31 2020 -0800 @@ -72,7 +72,7 @@ self._put(putUrl + '?' + urllib.parse.urlencode([ ('s', str(stmt[0])), ('p', str(putPred))]), - str(stmt[2].toPython()), + payload=str(stmt[2].toPython()), agent=agentFor.get(stmt[0], None), refreshSecs=self._getRefreshSecs(stmt[0])) activated.add((stmt[0], @@ -146,10 +146,7 @@ return self.inputGraph.rxValue(target, ROOM['refreshPutValue'], default=Literal('30s'))#.map(secsFromLiteral) - def _put(self, url, payload, refreshSecs, agent=None): - if isinstance(payload, str): - payload = payload.encode('utf8') - assert isinstance(payload, bytes) + def _put(self, url, payload: str, refreshSecs, agent=None): self.putOutputs.put(url, payload, agent, refreshSecs) import cyclone.sse @@ -169,9 +166,9 @@ def loop(self): if not self.bound: return - - self.sendEvent(message=json.dumps({ + puts = { 'puts': [row.report() for _, row in sorted(self.actions.putOutputs.state.items())], - }), event='update') + } + self.sendEvent(message=json.dumps(puts).encode('utf8'), event=b'update') reactor.callLater(1, self.loop)
--- a/service/reasoning/httpputoutputs.py Fri Feb 14 00:33:14 2020 -0800 +++ b/service/reasoning/httpputoutputs.py Fri Feb 14 00:33:31 2020 -0800 @@ -63,7 +63,7 @@ log.debug("PUT %s payload=%s agent=%s", self.url, self.payload, self.foafAgent) if not self.mockOutput: - self.currentRequest = treq.put(self.url, data=self.payload, + self.currentRequest = treq.put(self.url, data=self.payload.encode('utf8'), headers=h, timeout=3) self.currentRequest.addCallback(self.onResponse).addErrback( self.onError) @@ -115,8 +115,7 @@ self.mockOutput = mockOutput self.state = {} # url: HttpPutOutput - def put(self, url, payload, foafAgent, refreshSecs): - assert isinstance(url, str) + def put(self, url: str, payload: str, foafAgent: str, refreshSecs: float): if url not in self.state: self.state[url] = HttpPutOutput(url, mockOutput=self.mockOutput, refreshSecs=refreshSecs)
--- a/service/reasoning/rdflibtrig.py Fri Feb 14 00:33:14 2020 -0800 +++ b/service/reasoning/rdflibtrig.py Fri Feb 14 00:33:31 2020 -0800 @@ -11,10 +11,11 @@ def addTrig(graph, url, timeout=2): t1 = time.time() # workaround for some reason my ipv6 names don't resolve - for name, addr in ipv6Addresses.iteritems(): + for name, addr in ipv6Addresses.items(): url = url.replace('/' + name + ':', '/[' + addr + ']:') log.debug(' fetching %r', url) - response = yield treq.get(url, headers={'accept': ['application/trig']}, timeout=timeout) + response = yield treq.get(url, headers={'accept': ['application/trig']}, + timeout=timeout) if response.code != 200: raise ValueError("status %s from %s" % (response.code, url)) g = ConjunctiveGraph()
--- a/service/reasoning/reasoning.py Fri Feb 14 00:33:14 2020 -0800 +++ b/service/reasoning/reasoning.py Fri Feb 14 00:33:31 2020 -0800 @@ -195,8 +195,11 @@ """ try: log.info('POST to oneShot, headers=%s', self.request.headers) + ct = self.request.headers.get( + 'Content-Type', + self.request.headers.get('content-type', '')) dt = self.settings.reasoning.inputGraph.addOneShotFromString( - self.request.body, self.request.headers['content-type']) + self.request.body, ct) self.set_header('x-graph-ms', str(1000 * dt)) except Exception as e: traceback.print_exc()