light9 Changeset - 8da5b4edcb7e

Changeset - 8da5b4edcb7e

Parent rev.

Child rev.

[Not reviewed]

default

0 3 0

Drew Perttula - 6 years ago 2019-05-27 07:03:27
drewp@bigasterisk.com

type fixes, especially for collector_client
Ignore-this: c4ad6f85a477fc034ceb6e996e701de8

3 files changed with 12 insertions and 10 deletions:

bin/keyboardcomposer

light9/collector/collector_client.py

light9/networking.py

0 comments (0 inline, 0 general)

bin/keyboardcomposer

➞

Show inline comments

@@ @@ -6,13 +6,13 @@ from optparse import OptionParser @@
 import webcolors, colorsys
 from louie import dispatcher
 from twisted.internet import reactor, tksupport
 from twisted.web import resource
 from rdflib import URIRef, Literal
 import tkinter.tix as tk
 from typing import Dict, Tuple, List
+from typing import Any, Dict, Tuple, List
 from light9.Fadable import Fadable
 from light9.subclient import SubClient
 from light9 import showconfig, networking, prof
 from light9.uihelpers import toplevelat
 from light9.namespaces import L9, RDF, RDFS
@@ @@ -178,13 +178,13 @@ class SubmasterBox(tk.Frame): @@
         self.namelabel.config(
             text=self.graph.label(self.sub) or shortUri(self.sub))
 class KeyboardComposer(tk.Frame, SubClient):
     def __init__(self, root, graph, session, hw_sliders=True):
+    def __init__(self, root: tk.Tk, graph: SyncedGraph, session: URIRef, hw_sliders=True):
         tk.Frame.__init__(self, root, bg='black')
         SubClient.__init__(self)
         self.graph = graph
         self.session = session
         self.subbox: Dict[URIRef, SubmasterBox] = {}  # sub uri : SubmasterBox
@@ @@ -236,13 +236,13 @@ class KeyboardComposer(tk.Frame, SubClie @@
             bg='black',
             fg='white')
         self.save_stage_button.pack(side=tk.LEFT)
         self.sub_name = tk.Entry(self.buttonframe, bg='black', fg='white')
         self.sub_name.pack(side=tk.LEFT)
     def redraw_sliders(self):
+    def redraw_sliders(self) -> None:
         self.draw_sliders()
         if len(self.rows):
             self.change_row(self.current_row)
             self.rows[self.current_row].focus()
         self.stop_frequent_update_time = 0
@@ @@ -369,13 +369,13 @@ class KeyboardComposer(tk.Frame, SubClie @@
     def rowFromGraph(self):
         self.change_row(int(
             self.graph.value(self.session, L9['currentRow'], default=0)),
                         fromGraph=True)
     def change_row(self, row, fromGraph=False):
+    def change_row(self, row: int, fromGraph=False) -> None:
         old_row = self.current_row
         self.current_row = row
         self.current_row = max(0, self.current_row)
         self.current_row = min(len(self.rows) - 1, self.current_row)
         try:
             row = self.rows[self.current_row]
@@ @@ -630,13 +630,13 @@ class Sliders(BCF2000): @@
                 return
             kc.change_row(kc.current_row + diff)
             self.valueOut(name, 0)
 def launch(opts, root, graph, session):
+def launch(opts: Any, root: tk.Tk, graph: SyncedGraph, session: URIRef):
     tl = toplevelat("Keyboard Composer - %s" % opts.session,
                     existingtoplevel=root,
                     graph=graph,
                     session=session)
     kc = KeyboardComposer(tl, graph, session, hw_sliders=not opts.no_sliders)

light9/collector/collector_client.py

➞

Show inline comments

@@ @@ -17,13 +17,13 @@ class TwistedZmqClient(object): @@
         self.conn = ZmqPushConnection(zf, e)
     def send(self, msg):
         self.conn.push(msg)
 def toCollectorJson(client, session, settings):
+def toCollectorJson(client, session, settings) -> str:
     assert isinstance(settings, DeviceSettings)
     return json.dumps({
         'settings': settings.asList(),
         'client': client,
         'clientSession': session,
         'sendTime': time.time(),
@@ @@ -38,13 +38,13 @@ def sendToCollectorZmq(msg): @@
     return defer.succeed(0)
 def sendToCollector(client, session, settings, useZmq=False):
     """deferred to the time in seconds it took to get a response from collector"""
     sendTime = time.time()
     msg = toCollectorJson(client, session, settings)
+    msg = toCollectorJson(client, session, settings).encode('utf8')
     if useZmq:
         d = sendToCollectorZmq(msg)
     else:
         d = treq.put(networking.collector.path('attrs'), data=msg, timeout=1)

light9/networking.py

➞

Show inline comments

 from rdflib import URIRef
 from urllib.parse import urlparse
 from .showconfig import getGraph, showUri
 from .namespaces import L9
 class ServiceAddress(object):
     def __init__(self, service):
         self.service = service
     def _url(self):
+    def _url(self) -> URIRef:
         graph = getGraph()
         net = graph.value(showUri(), L9['networking'])
         ret = graph.value(net, self.service)
         if ret is None:
             raise ValueError("no url for %s -> %s -> %s" %
                              (showUri(), L9['networking'], self.service))
         return str(ret)
         assert isinstance(ret, URIRef)
         return ret
     @property
     def port(self):
         return urlparse(self._url()).port
     @property
     def host(self):
         return urlparse(self._url()).hostname
     @property
     def url(self):
+    def url(self) -> URIRef:
         return self._url()
     value = url
     def path(self, more):
         return self.url + str(more)

0 comments (0 inline, 0 general)