# HG changeset patch # User Amine Sehili # Date 1550084978 -3600 # Node ID 03062069b491ccb91363d4406c8a75550ea0b23c # Parent 4d290493f59097718503d64459cf4a09ed380808 Use data before file in audio saving functions signature diff -r 4d290493f590 -r 03062069b491 auditok/io.py --- a/auditok/io.py Mon Feb 11 20:28:51 2019 +0100 +++ b/auditok/io.py Wed Feb 13 20:09:38 2019 +0100 @@ -873,7 +873,7 @@ ) -def _save_raw(file, data): +def _save_raw(data, file): """ Saves audio data as a headerless (i.e. raw) file. See also :func:`to_file`. @@ -882,7 +882,7 @@ fp.write(data) -def _save_wave(file, data, sampling_rate, sample_width, channels): +def _save_wave(data, file, sampling_rate, sample_width, channels): """ Saves audio data to a wave file. See also :func:`to_file`. @@ -899,7 +899,7 @@ def _save_with_pydub( - file, data, audio_format, sampling_rate, sample_width, channels + data, file, audio_format, sampling_rate, sample_width, channels ): """ Saves audio data with pydub (https://github.com/jiaaro/pydub). @@ -948,7 +948,7 @@ """ audio_format = _guess_audio_format(audio_format, file) if audio_format in (None, "raw"): - _save_raw(file, data) + _save_raw(data, file) return try: params = _get_audio_parameters(kwargs) @@ -958,7 +958,7 @@ "other than raw. Error detail: {}".format(exc) raise AudioParameterError(err_message) if audio_format in ("wav", "wave"): - _save_wave(file, data, sampling_rate, sample_width, channels) + _save_wave(data, file, sampling_rate, sample_width, channels) elif _WITH_PYDUB: _save_with_pydub( file, data, audio_format, sampling_rate, sample_width, channels diff -r 4d290493f590 -r 03062069b491 tests/test_io.py --- a/tests/test_io.py Mon Feb 11 20:28:51 2019 +0100 +++ b/tests/test_io.py Wed Feb 13 20:09:38 2019 +0100 @@ -536,7 +536,7 @@ mono_channels = [PURE_TONE_DICT[freq] for freq in frequencies] data = _array_to_bytes(array(fmt, _sample_generator(*mono_channels))) tmpfile = NamedTemporaryFile() - _save_raw(tmpfile.name, data) + _save_raw(data, tmpfile.name) self.assertTrue(filecmp.cmp(tmpfile.name, filename, shallow=False)) @genty_dataset( @@ -552,7 +552,7 @@ mono_channels = [PURE_TONE_DICT[freq] for freq in frequencies] data = _array_to_bytes(array(fmt, _sample_generator(*mono_channels))) tmpfile = NamedTemporaryFile() - _save_wave(tmpfile.name, data, sampling_rate, sample_width, channels) + _save_wave(data, tmpfile.name, sampling_rate, sample_width, channels) self.assertTrue(filecmp.cmp(tmpfile.name, filename, shallow=False)) @genty_dataset( @@ -565,7 +565,7 @@ params = AUDIO_PARAMS_SHORT.copy() del params[missing_param] srate, swidth, channels, _ = _get_audio_parameters(params) - _save_wave("audio", b"\0\0", srate, swidth, channels) + _save_wave(b"\0\0", "audio", srate, swidth, channels) @genty_dataset( raw_with_audio_format=("audio", "raw"),