Skip to content

Commit

Permalink
fix _check_filter_and_make_params() usage
Browse files Browse the repository at this point in the history
The function wants an entitiy as first argument.
The usage is correct in single entitities, but wasn't in entity lists.

The problem was introduced in
86110dc
where the function parameters were changed.
That gave
TypeError: ... takes at least 2 arguments (2 give)
when using get_releases_by_discid() and others.

The problem was hidden with the fix in
4260ed5
No TypeError anymore,
but the entity was set to the includes, includes were empty in return.

For single entity requests this was fixed correctly in
088562d

This now finally fixes this for entity list requests.
  • Loading branch information
JonnyJD committed Mar 12, 2013
1 parent c63e4dd commit 9bc221c
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions musicbrainzngs/musicbrainz.py
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -734,19 +734,19 @@ def search_works(query='', limit=None, offset=None, strict=False, **fields):


# Lists of entities # Lists of entities
def get_releases_by_discid(id, includes=[], release_status=[], release_type=[]): def get_releases_by_discid(id, includes=[], release_status=[], release_type=[]):
params = _check_filter_and_make_params(includes, release_status, release_type=release_type) params = _check_filter_and_make_params("release", includes, release_status, release_type=release_type)
return _do_mb_query("discid", id, includes, params) return _do_mb_query("discid", id, includes, params)


def get_recordings_by_echoprint(echoprint, includes=[], release_status=[], release_type=[]): def get_recordings_by_echoprint(echoprint, includes=[], release_status=[], release_type=[]):
params = _check_filter_and_make_params(includes, release_status, release_type) params = _check_filter_and_make_params("recording", includes, release_status, release_type)
return _do_mb_query("echoprint", echoprint, includes, params) return _do_mb_query("echoprint", echoprint, includes, params)


def get_recordings_by_puid(puid, includes=[], release_status=[], release_type=[]): def get_recordings_by_puid(puid, includes=[], release_status=[], release_type=[]):
params = _check_filter_and_make_params(includes, release_status, release_type) params = _check_filter_and_make_params("recording", includes, release_status, release_type)
return _do_mb_query("puid", puid, includes, params) return _do_mb_query("puid", puid, includes, params)


def get_recordings_by_isrc(isrc, includes=[], release_status=[], release_type=[]): def get_recordings_by_isrc(isrc, includes=[], release_status=[], release_type=[]):
params = _check_filter_and_make_params(includes, release_status, release_type) params = _check_filter_and_make_params("recording", includes, release_status, release_type)
return _do_mb_query("isrc", isrc, includes, params) return _do_mb_query("isrc", isrc, includes, params)


def get_works_by_iswc(iswc, includes=[]): def get_works_by_iswc(iswc, includes=[]):
Expand Down

0 comments on commit 9bc221c

Please sign in to comment.