various python3 fixes

Fixes: #6
Fixes: #1
Signed-off-by: Jaroslav Kysela <[email protected]>

Author: perexg

pyalsa/alsahcontrol.c

@@ -621,7 +621,7 @@ static void
 pyalsahcontrolelement_dealloc(struct pyalsahcontrolelement *self)
 {
 	if (self->elem) {
-		Py_DECREF(self->callback);
+		Py_XDECREF(self->callback);
 		snd_hctl_elem_set_callback(self->elem, NULL);
 	}
 	Py_XDECREF(self->pyhandle);

pyalsa/alsaseq.c

@@ -1677,16 +1677,11 @@ static PyGetSetDef SeqEvent_getset[] = {
 static PyObject *
 SeqEvent_repr(SeqEventObject *self) {
   PyObject *key = PyInt_FromLong(self->event->type);
-  ConstantObject *constObject = (ConstantObject *)
-    PyDict_GetItem(TDICT(EVENT_TYPE), key);
-  const char *typestr = "UNKNOWN";
+  ConstantObject *typeObject = (ConstantObject *)PyDict_GetItem(TDICT(EVENT_TYPE), key);
   const char *timemode = "";
   unsigned int dtime = 0;
   unsigned int ntime = 0;
   Py_DECREF(key);
-  if (constObject != NULL) {
-    typestr = constObject->extra.name;
-  }
 
   if (snd_seq_ev_is_real(self->event)) {
     timemode = "real";
@@ -1697,17 +1692,18 @@ SeqEvent_repr(SeqEventObject *self) {
     dtime = self->event->time.tick;
   }
 
-  return PyUnicode_FromFormat("<alsaseq.SeqEvent type=%s(%d) flags=%d tag=%d "
+  return PyUnicode_FromFormat("<alsaseq.SeqEvent type=%S(%d) flags=%d tag=%d "
 			     "queue=%d time=%s(%u.%u) from=%d:%d to=%d:%d "
 			     "at %p>",
-			     typestr,
+			     typeObject,
 			     self->event->type, self->event->flags,
 			     self->event->tag, self->event->queue,
 			     timemode, dtime, ntime,
 			     (self->event->source).client,
 			     (self->event->source).port,
 			     (self->event->dest).client,
-			     (self->event->dest).port, self);
+			     (self->event->dest).port,
+			     self);
 }
 
 /** alsaseq.SeqEvent get_data() method: __doc__ */

pyalsa/common.h

@@ -22,6 +22,8 @@
 #ifndef __PYALSA_COMMON_H
 #define __PYALSA_COMMON_H
 
+#define PY_SSIZE_T_CLEAN
+
 #include "Python.h"
 #include "structmember.h"
 #include "frameobject.h"

test/cardtest1.py

@@ -2,9 +2,9 @@
 # -*- Python -*-
 
 import sys
-sys.path.insert(0, '../pyalsa')
+sys.path.insert(0, '..')
 del sys
-import alsacard
+from pyalsa import alsacard
 
 print('asoundlibVersion:', alsacard.asoundlib_version())
 print('cardLoad:', alsacard.card_load(0))

test/ctltest1.py

@@ -2,9 +2,9 @@
 # -*- Python -*-
 
 import sys
-sys.path.insert(0, '../pyalsa')
+sys.path.insert(0, '..')
 del sys
-import alsacontrol
+from pyalsa import alsacontrol
 
 ctl = alsacontrol.Control()
 print('Card info:', ctl.card_info())

test/hctltest1.py

@@ -2,9 +2,9 @@
 # -*- Python -*-
 
 import sys
-sys.path.insert(0, '../pyalsa')
+sys.path.insert(0, '..')
 del sys
-import alsahcontrol
+from pyalsa import alsahcontrol
 
 def info(element):
 	info = alsahcontrol.Info(element)

test/hctltest2.py

@@ -2,10 +2,10 @@
 # -*- Python -*-
 
 import sys
-sys.path.insert(0, '../pyalsa')
+sys.path.insert(0, '..')
 del sys
 import select
-import alsahcontrol
+from pyalsa import alsahcontrol
 
 def parse_event_mask(events):
 	if events == 0:

test/mixertest1.py

@@ -2,10 +2,10 @@
 # -*- Python -*-
 
 import sys
-sys.path.insert(0, '../pyalsa')
+sys.path.insert(0, '..')
 del sys
 from alsamemdebug import debuginit, debug, debugdone
-import alsamixer
+from pyalsa import alsamixer
 
 def print_elem(e):
 	direction = ["playback", "capture"]

test/mixertest2.py

@@ -4,7 +4,7 @@
 import sys
 sys.path.insert(0, '../pyalsa')
 del sys
-import alsamixer
+from pyalsa import alsamixer
 import select
 
 def parse_event_mask(events):
@@ -20,15 +20,15 @@ def parse_event_mask(events):
 
 def event_callback(element, events):
 
-	print 'CALLBACK (DEF)! [%s] %s:%i' % (parse_event_mask(events), element.name, element.index)
-	print '  ', element.get_volume_tuple(), element.get_switch_tuple()
+	print('CALLBACK (DEF)! [%s] %s:%i' % (parse_event_mask(events), element.name, element.index))
+	print('  ', element.get_volume_tuple(), element.get_switch_tuple())
 
 
 class MyElementEvent:
 
 	def callback(self, element, events):
-		print 'CALLBACK (CLASS)! [%s] %s:%i' % (parse_event_mask(events), element.name, element.index)
-		print '  ', element.get_volume_tuple(), element.get_switch_tuple()
+		print('CALLBACK (CLASS)! [%s] %s:%i' % (parse_event_mask(events), element.name, element.index))
+		print('  ', element.get_volume_tuple(), element.get_switch_tuple())
 
 
 mixer = alsamixer.Mixer()
@@ -44,5 +44,5 @@ def callback(self, element, events):
 mixer.register_poll(poller)
 while True:
 	poller.poll()
-	print 'Poll OK!'
+	print('Poll OK!')
 	mixer.handle_events()