From afcbf3d3142ff7cf607acbc8f512a150f0699e97 Mon Sep 17 00:00:00 2001 From: "Dustin C. Hatch" Date: Wed, 28 Nov 2012 12:26:36 -0600 Subject: [PATCH] Get rid of unicode business in Permission objects --HG-- branch : py3k --- src/milla/auth/permissions.py | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/src/milla/auth/permissions.py b/src/milla/auth/permissions.py index 00a78e0..553285d 100644 --- a/src/milla/auth/permissions.py +++ b/src/milla/auth/permissions.py @@ -86,17 +86,8 @@ class Permission(BasePermission): def __init__(self, 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): - if isinstance(self.name, str): - return self.name - else: - return self.name.encode('utf-8') + return str(self.name) def __eq__(self, other): return self is other or str(self) == str(other) @@ -119,7 +110,7 @@ class PermissionRequirement(BasePermission): self.requirements = requirements def __str__(self): - return unicode(self).encode('utf-8') + return ', '.join(self.requirements) class PermissionRequirementAll(PermissionRequirement): '''Complex permission requirement needing all given permissions'''