Skip to content

Improve __repr__ #76

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mgeier merged 3 commits into from
Jan 9, 2015
Merged

Improve __repr__ #76

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e5ce62b
modified __repr__ for 2.6 compatibility
bastibe Dec 10, 2014
ee60d3a
included subtype and endian in __repr__
bastibe Dec 17, 2014
5e9a075
Store file-like object as SoundFile.name
mgeier Dec 23, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions pysoundfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -636,10 +636,10 @@ def __init__(self, file, mode='r', samplerate=None, channels=None,
mode_int = _snd.SFM_WRITE

old_fmt = format
self._name = getattr(file, 'name', file)
self._name = file
if format is None:
format = str(self.name).rsplit('.', 1)[-1].upper()
if format not in _formats and 'r' not in modes:
format = str(getattr(file, 'name', file)).rsplit('.', 1)[-1]
if format.upper() not in _formats and 'r' not in modes:
raise TypeError(
"No format specified and unable to get format from "
"file extension: %s" % repr(self.name))
Expand Down Expand Up @@ -718,9 +718,10 @@ def __init__(self, file, mode='r', samplerate=None, channels=None,
_file = None

def __repr__(self):
return ('SoundFile("{}", mode="{}", samplerate={}, channels={}, '
'format="{}")').format(self.name, self.mode, self.samplerate,
self.channels, self.format)
return ('SoundFile(%r, mode=%r, samplerate=%i, channels=%i, '
'format=%r, subtype=%r, endian=%r)' %
(self.name, self.mode, self.samplerate, self.channels,
self.format, self.subtype, self.endian))

def __del__(self):
self.close()
Expand Down
3 changes: 2 additions & 1 deletion tests/test_pysoundfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -449,7 +449,8 @@ def test__repr__(sf_stereo_r):
if not isinstance(sf_stereo_r.name, int):
assert repr(sf_stereo_r) == ('SoundFile("{}", mode="r", '
'samplerate=44100, channels=2, '
'format="WAV")').format(filename_stereo)
'format="WAV", subtype="FLOAT", '
'endian="FILE")').format(filename_stereo)

def test_mode_should_be_in_write_mode(sf_stereo_w):
assert sf_stereo_w.mode == 'w'
Expand Down