Changeset bfbfafa for python

Timestamp:

Oct 3, 2017, 10:31:12 PM (7 years ago)

Author:

Paul Brossier <piem@piem.org>

Branches:

feature/autosink, feature/cnn, feature/cnn_org, feature/constantq, feature/crepe, feature/crepe_org, feature/pitchshift, feature/pydocstrings, feature/timestretch, fix/ffmpeg5, master

Children:

2e5c52e

Parents:

7b7a58e (diff), 25db68c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into dct

Location:

python

Files:

• ext/py-cvec.c (modified) (4 diffs)
• tests/test_aubio_cmd.py (modified) (1 diff)

python/ext/py-cvec.c

@@ -143 +143 @@
   npy_intp length;
   if (!PyAubio_IsValidVector(input)) {
-    return 1;
+    return -1;
   }
   length = PyArray_SIZE ((PyArrayObject *)input);
@@ -150 +150 @@
         "input array has length %" NPY_INTP_FMT ", but cvec has length %d", length,
         vec->length);
-    return 1;
+    return -1;
   }
 
@@ -164 +164 @@
   npy_intp length;
   if (!PyAubio_IsValidVector(input)) {
-    return 1;
+    return -1;
   }
   length = PyArray_SIZE ((PyArrayObject *)input);
@@ -171 +171 @@
         "input array has length %" NPY_INTP_FMT ", but cvec has length %d", length,
         vec->length);
-    return 1;
+    return -1;
   }
 

python/tests/test_aubio_cmd.py

@@ -11 +11 @@
 
     def test_default_creation(self):
-        assert self.a_parser.parse_args(['-V']).show_version
+        try:
+            assert self.a_parser.parse_args(['-V']).show_version
+        except SystemExit:
+            url = 'https://bugs.python.org/issue9253'
+            self.skipTest('subcommand became optional in py3, see %s' % url)
 
 class aubio_cmd_utils(TestCase):