Adding Python3 compatibility

pysimpledmx/pysimpledmx.py

@@ -1,82 +1,84 @@
+from __future__ import print_function
 import serial, sys
+import logging
 
-START_VAL   = 0x7E
-END_VAL     = 0xE7
+START_VAL = 0x7E
+END_VAL = 0xE7
 
-COM_BAUD    = 57600
+COM_BAUD = 57600
 COM_TIMEOUT = 1
-COM_PORT    = 7
-DMX_SIZE    = 512
+COM_PORT = 7
+DMX_SIZE = 512
 
 LABELS = {
-         'GET_WIDGET_PARAMETERS' :3,  #unused
-         'SET_WIDGET_PARAMETERS' :4,  #unused
-         'RX_DMX_PACKET'         :5,  #unused
-         'TX_DMX_PACKET'         :6,
-         'TX_RDM_PACKET_REQUEST' :7,  #unused
-         'RX_DMX_ON_CHANGE'      :8,  #unused
-      }
+    'GET_WIDGET_PARAMETERS': 3,  # unused
+    'SET_WIDGET_PARAMETERS': 4,  # unused
+    'RX_DMX_PACKET': 5,  # unused
+    'TX_DMX_PACKET': 6, 'TX_RDM_PACKET_REQUEST': 7,  # unused
+    'RX_DMX_ON_CHANGE': 8,  # unused
+}
 
 
-class DMXConnection(object):
-  def __init__(self, comport = None):
-    '''
-    On Windows, the only argument is the port number. On *nix, it's the path to the serial device.
-    For example:
-        DMXConnection(4)              # Windows
-        DMXConnection('/dev/tty2')    # Linux
-        DMXConnection("/dev/ttyUSB0") # Linux
-    '''
-    self.dmx_frame = [0] * DMX_SIZE
-    try:
-      self.com = serial.Serial(comport, baudrate = COM_BAUD, timeout = COM_TIMEOUT)
-    except:
-      com_name = 'COM%s' % (comport + 1) if type(comport) == int else comport
-      print "Could not open device %s. Quitting application." % com_name
-      sys.exit(0)
+class DMXConnection( object ):
+    auto_render = False
 
-    print "Opened %s." % (self.com.portstr)
+    def __init__( self, comport=None, autorender=False ):
+        '''
+        On Windows, the only argument is the port number. On *nix, it's the path to the serial device.
+        For example:
+            DMXConnection(4)              # Windows
+            DMXConnection('/dev/tty2')    # Linux
+            DMXConnection("/dev/ttyUSB0") # Linux
+        '''
+        self.dmx_frame = [ 0 ] * DMX_SIZE
+        self.auto_render = autorender
+        try:
+            self.com = serial.Serial( comport, baudrate=COM_BAUD, timeout=COM_TIMEOUT )
+        except:
+            com_name = 'COM%s' % (comport + 1) if type( comport ) == int else comport
+            logging.error( "Could not open device %s. Quitting application." % com_name )
+            # sys.exit(0)
 
+        logging.info( "Opened %s." % (self.com.portstr) )
 
-  def setChannel(self, chan, val, autorender = False):
-    '''
-    Takes channel and value arguments to set a channel level in the local
-    DMX frame, to be rendered the next time the render() method is called.
-    '''
-    if not 1 <= chan-1 <= DMX_SIZE:
-      print 'Invalid channel specified: %s' % chan-1
-      return
-    # clamp value
-    val = max(0, min(val, 255))
-    self.dmx_frame[chan-1] = val
-    if autorender: self.render()
+    def setChannel( self, chan, val, autorender=False ):
+        '''
+        Takes channel and value arguments to set a channel level in the local
+        DMX frame, to be rendered the next time the render() method is called.
+        '''
+        if not 1 <= chan - 1 <= DMX_SIZE:
+            logging.error( 'Invalid channel specified: %s' % chan - 1 )
+            return
+        # clamp value
+        val = max( 0, min( val, 255 ) )
+        self.dmx_frame[ chan - 1 ] = val
+        if autorender or self.auto_render:
+            self.render( )
 
-  def clear(self, chan = 0):
-    '''
-    Clears all channels to zero. blackout.
-    With optional channel argument, clears only one channel.
-    '''
-    if chan == 0:
-      self.dmx_frame = [0] * DMX_SIZE
-    else:
-      self.dmx_frame[chan-1] = 0
+    def clear( self, chan=0 ):
+        '''
+        Clears all channels to zero. blackout.
+        With optional channel argument, clears only one channel.
+        '''
+        if chan == 0:
+            self.dmx_frame = [ 0 ] * DMX_SIZE
+        else:
+            self.dmx_frame[ chan - 1 ] = 0
 
+    def render( self ):
+        ''''
+        Updates the DMX output from the USB DMX Pro with the values from self.dmx_frame.
+        '''
+        packet = [ START_VAL, LABELS[ 'TX_DMX_PACKET' ], len( self.dmx_frame ) & 0xFF,
+                                                         (len( self.dmx_frame ) >> 8) & 0xFF, ]
+        packet += self.dmx_frame
+        packet.append( END_VAL )
 
-  def render(self):
-    ''''
-    Updates the DMX output from the USB DMX Pro with the values from self.dmx_frame.
-    '''
-    packet = [
-              START_VAL,
-              LABELS['TX_DMX_PACKET'],
-              len(self.dmx_frame) & 0xFF,
-              (len(self.dmx_frame) >> 8) & 0xFF,
-    ]
-    packet += self.dmx_frame
-    packet.append(END_VAL)
+        data = bytearray(packet)
 
-    packet = map(chr, packet)
-    self.com.write(''.join(packet))
+        logging.debug( packet )
+        logging.debug( data )
+        self.com.write( data )
 
-  def close(self):
-    self.com.close()
+    def close( self ):
+        self.com.close( )

setup.py

@@ -4,7 +4,7 @@
 
 setup(
     name="pysimpledmx",
-    version="0.1.0",
+    version="0.2.0",
     description="simple dmx control for the Enttec DMX USB Pro",
     license="GPLV3",
     author="c0z3n",
@@ -18,6 +18,8 @@
         "Programming Language :: Python",
         'Programming Language :: Python :: 2',
         "Programming Language :: Python :: 2.7",
+        "Programming Language :: Python :: 3",
+        "Programming Language :: Python :: 3.5",
         "Intended Audience :: Other Audience",
         "Topic :: Artistic Software",
     ]