fergalmoran/dss.api
1
0
Fork 0
mirror of https://github.com/fergalmoran/dss.api.git synced 2025-12-25 10:49:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge conflicts

Browse Source
This commit is contained in:
Fergal Moran
2015-08-20 11:20:40 +01:00
parent 713ce6c7fb dfa82d4e76
commit f5be1d3f7b
132 changed files with 6190 additions and 6377 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
api/serializers.py
View File

@@ -208,7 +208,7 @@ class MixSerializer(serializers.ModelSerializer):
validated_data.pop('genres', None)
return super(MixSerializer, self).update(instance, validated_data)
except MixUpdateException, ex:
except MixUpdateException as ex:
raise ex
def is_valid(self, raise_exception=False):
@@ -314,8 +314,8 @@ class UserProfileSerializer(serializers.ModelSerializer):
def get_roles(self, obj):
try:
return obj.get_roles()
except Exception, ex:
print "Error getting roles: " + ex.message
except Exception as ex:
print("Error getting roles: " + ex)
return []
def get_isme(self, obj):