dustin
/
Milla
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Get rid of unicode business in Permission objects 

--HG--
branch : py3k
master
Dustin C. Hatch 2012-11-28 12:26:36 -06:00
parent a8a90294d2
commit afcbf3d314
1 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/milla/auth/permissions.py
View File

@ -86,17 +86,8 @@ class Permission(BasePermission):
def __init__(self, name): def __init__(self, name):
self.name = name self.name = name
def __unicode__(self):
if isinstance(self.name, unicode):
return self.name
else:
return self.name.decode('utf-8')
def __str__(self): def __str__(self):
if isinstance(self.name, str): return str(self.name)
return self.name
else:
return self.name.encode('utf-8')
def __eq__(self, other): def __eq__(self, other):
return self is other or str(self) == str(other) return self is other or str(self) == str(other)
@ -119,7 +110,7 @@ class PermissionRequirement(BasePermission):
self.requirements = requirements self.requirements = requirements
def __str__(self): def __str__(self):
return unicode(self).encode('utf-8') return ', '.join(self.requirements)
class PermissionRequirementAll(PermissionRequirement): class PermissionRequirementAll(PermissionRequirement):
'''Complex permission requirement needing all given permissions''' '''Complex permission requirement needing all given permissions'''