History

Merge branch 'fix/pyextwarnings'

Paul Brossier committed 7 years ago

Commit 36366002 parents 062eaf1 51284ab2 files · +8 −8Browse files

Showing the changes to python (2 of 2 files). Show all

Unified · Split

2 files
  1. python/ext/py-filterbank.c +7 −7
  2. python/ext/py-source.c +1 −1
python/ext/py-filterbank.c+7−7
@@ -122,8 +122,8 @@ Py_filterbank_set_triangle_bands (Py_filterbank * self, PyObject *args) · 121 unmodified lines
122122 uint_t err = 0;
123123
124124 PyObject *input;
125− uint_t samplerate;
126− if (!PyArg_ParseTuple (args, "OI", &input, &samplerate)) {
125+ smpl_t samplerate;
126+ if (!PyArg_ParseTuple (args, "O" AUBIO_NPY_SMPL_CHR, &input, &samplerate)) {
127127 return NULL;
128128 }
129129
@@ -268,9 +268,9 @@ Py_filterbank_get_coeffs (Py_filterbank * self, PyObject *unused) · 138 unmodified lines
268268 static PyObject *
269269 Py_filterbank_set_power(Py_filterbank *self, PyObject *args)
270270 {
271− uint_t power;
271+ smpl_t power;
272272
273− if (!PyArg_ParseTuple (args, "I", &power)) {
273+ if (!PyArg_ParseTuple (args, AUBIO_NPY_SMPL_CHR, &power)) {
274274 return NULL;
275275 }
276276 if(aubio_filterbank_set_power (self->o, power)) {
@@ -291,12 +291,12 @@ Py_filterbank_set_power(Py_filterbank *self, PyObject *args) · 14 unmodified lines
291291 static PyObject *
292292 Py_filterbank_set_norm(Py_filterbank *self, PyObject *args)
293293 {
294− uint_t playing;
294+ smpl_t norm;
295295
296− if (!PyArg_ParseTuple (args, "I", &playing)) {
296+ if (!PyArg_ParseTuple (args, AUBIO_NPY_SMPL_CHR, &norm)) {
297297 return NULL;
298298 }
299− if(aubio_filterbank_set_norm (self->o, playing)) {
299+ if(aubio_filterbank_set_norm (self->o, norm)) {
300300 if (PyErr_Occurred() == NULL) {
301301 PyErr_SetString (PyExc_ValueError,
302302 "error running filterbank.set_power");
python/ext/py-source.c+1−1
@@ -155,7 +155,7 @@ static char Py_source_doc[] = "" · 154 unmodified lines
155155 "... for samples in source:\n"
156156 "... n_frames += len(samples)\n"
157157 "... print('read', n_frames, 'samples in', samples.shape[0], 'channels',\n"
158−"... 'from file \"\%s\"' \% source.uri)\n"
158+"... 'from file \"%%s\"' %% source.uri)\n"
159159 "...\n"
160160 "read 239334 samples in 2 channels from file \"audiotrack.wav\"\n"
161161 "\n"

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t