Changeset bfbfafa for python


Ignore:
Timestamp:
Oct 3, 2017, 10:31:12 PM (6 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:
2 edited

Legend:

Unmodified
Added
Removed
  • python/ext/py-cvec.c

    r7b7a58e rbfbfafa  
    143143  npy_intp length;
    144144  if (!PyAubio_IsValidVector(input)) {
    145     return 1;
     145    return -1;
    146146  }
    147147  length = PyArray_SIZE ((PyArrayObject *)input);
     
    150150        "input array has length %" NPY_INTP_FMT ", but cvec has length %d", length,
    151151        vec->length);
    152     return 1;
     152    return -1;
    153153  }
    154154
     
    164164  npy_intp length;
    165165  if (!PyAubio_IsValidVector(input)) {
    166     return 1;
     166    return -1;
    167167  }
    168168  length = PyArray_SIZE ((PyArrayObject *)input);
     
    171171        "input array has length %" NPY_INTP_FMT ", but cvec has length %d", length,
    172172        vec->length);
    173     return 1;
     173    return -1;
    174174  }
    175175
  • python/tests/test_aubio_cmd.py

    r7b7a58e rbfbfafa  
    1111
    1212    def test_default_creation(self):
    13         assert self.a_parser.parse_args(['-V']).show_version
     13        try:
     14            assert self.a_parser.parse_args(['-V']).show_version
     15        except SystemExit:
     16            url = 'https://bugs.python.org/issue9253'
     17            self.skipTest('subcommand became optional in py3, see %s' % url)
    1418
    1519class aubio_cmd_utils(TestCase):
Note: See TracChangeset for help on using the changeset viewer.