Bitbucket cannot automatically merge this request.
The commits that make up this pull request have been removed.
Bitbucket cannot automatically merge this request due to conflicts.
Review the conflicts on the Overview tab. You can then either decline the request or merge it manually on your local system using the following commands:
hg pull -r default https://bitbucket.org/alvra/django-piston
This fix allows you to return keyword arguments from the 'resource_uri' method in handlers, while maintaining backwards compatibility. It just removes the unpacking of the 'resource_uri' return value, when we're just repacking it later.