diff bin/dmxserver @ 1859:f066d6e874db

2to3 with these fixers: all idioms set_literal Ignore-this: cbd28518218c2f0ddce8c4f92d3b8b33
author drewp@bigasterisk.com
date Wed, 22 May 2019 00:08:22 +0000
parents 7772cc48e016
children 5bcb950024af
line wrap: on
line diff
--- a/bin/dmxserver	Tue May 21 23:56:12 2019 +0000
+++ b/bin/dmxserver	Wed May 22 00:08:22 2019 +0000
@@ -24,7 +24,7 @@
   if parport fails, run in dummy mode (and make an option for that too)
 """
 
-from __future__ import division
+
 from twisted.internet import reactor
 from twisted.web import xmlrpc, server
 import sys, time, os
@@ -68,7 +68,7 @@
             self.port,
             txosc. async .DatagramServerProtocol(self.receiver),
             interface='0.0.0.0')
-        print "Listening OSC on udp port %s" % (self.port)
+        print("Listening OSC on udp port %s" % (self.port))
 
     def pixel_handler(self, message, address):
         # this is already 1-based though I don't know why
@@ -97,7 +97,7 @@
         # desired seconds between sendlevels() calls
         self.calldelay = 1 / options.updates_per_sec
 
-        print "starting parport connection"
+        print("starting parport connection")
         self.parportdmx = UsbDMX(dimmers=90, port=options.dmx_device)
         if os.environ.get('DMXDUMMY', 0):
             self.parportdmx.godummy()
@@ -122,12 +122,12 @@
         reactor.callLater(1, self.purgeclients)
 
         now = time.time()
-        cids = self.lastseen.keys()
+        cids = list(self.lastseen.keys())
         for cid in cids:
             lastseen = self.lastseen[cid]
             if lastseen < now - purge_age:
-                print("forgetting client %s (no activity for %s sec)" %
-                      (cid, purge_age))
+                print(("forgetting client %s (no activity for %s sec)" %
+                      (cid, purge_age)))
                 try:
                     del self.clientlevels[cid]
                 except KeyError:
@@ -175,7 +175,7 @@
         self.combinedlevels = []
         for chan in range(0, self.parportdmx.dimmers):
             x = 0
-            for clientlist in self.clientlevels.values():
+            for clientlist in list(self.clientlevels.values()):
                 if len(clientlist) > chan:
                     # clamp client levels to 0..1
                     cl = max(0, min(1, clientlist[chan]))
@@ -184,8 +184,8 @@
 
     def printlevels(self):
         """write all the levels to stdout"""
-        print "Levels:", "".join(
-            ["% 2d " % (x * 100) for x in self.combinedlevels])
+        print("Levels:", "".join(
+            ["% 2d " % (x * 100) for x in self.combinedlevels]))
 
     def printstats(self):
         """print the clock, freq, etc, with a \r at the end"""
@@ -194,7 +194,7 @@
             time.strftime("%H:%M:%S"),
             str(self.updatefreq),
         ))
-        for cid, freq in self.clientfreq.items():
+        for cid, freq in list(self.clientfreq.items()):
             sys.stdout.write("[%s %s] " % (cid, str(freq)))
         sys.stdout.write("\r")
         sys.stdout.flush()
@@ -237,7 +237,7 @@
 
     def trackClientFreq(self, cid):
         if cid not in self.lastseen:
-            print "hello new client %s" % cid
+            print("hello new client %s" % cid)
             self.clientfreq[cid] = Updatefreq()
         self.lastseen[cid] = time.time()
         self.clientfreq[cid].update()
@@ -264,13 +264,13 @@
                   help="dummy mode, same as DMXDUMMY=1 env variable")
 (options, songfiles) = parser.parse_args()
 
-print options
+print(options)
 
 if options.dummy:
     os.environ['DMXDUMMY'] = "1"
 
 port = networking.dmxServer.port
-print "starting xmlrpc server on port %s" % port
+print("starting xmlrpc server on port %s" % port)
 xmlrpcServe = XMLRPCServe(options)
 reactor.listenTCP(port, server.Site(xmlrpcServe))