Merge branch 'master' into apiv2_tags

Conflicts:
	openphoto/objects.py
	tests/test_tags.py
This commit is contained in:
sneakypete81 2013-04-28 15:29:33 +01:00
commit 6d5fe4433c
8 changed files with 90 additions and 45 deletions

View file

@ -19,10 +19,14 @@ class ApiTag:
return self._client.post("/tag/create.json", tag=tag, **kwds)["result"]
def delete(self, tag, **kwds):
""" Delete a tag """
"""
Delete a tag.
Returns True if successful.
Raises an OpenPhotoError if not.
"""
if not isinstance(tag, Tag):
tag = Tag(self._client, {"id": tag})
tag.delete(**kwds)
return tag.delete(**kwds)
def update(self, tag, **kwds):
""" Update a tag """