diff --git a/edbob/db/extensions/auth/model.py b/edbob/db/extensions/auth/model.py index a3f36f0..f167739 100644 --- a/edbob/db/extensions/auth/model.py +++ b/edbob/db/extensions/auth/model.py @@ -51,7 +51,8 @@ class Permission(Base): permission = Column(String(50), primary_key=True) def __repr__(self): - return "" % (self.role, self.permission) + return "Permission(role_uuid={0}, permission={1})".format( + repr(self.role_uuid), repr(self.permission)) def __unicode__(self): return unicode(self.permission or '') @@ -69,7 +70,7 @@ class UserRole(Base): role_uuid = Column(String(32), ForeignKey('roles.uuid')) def __repr__(self): - return "" % (self.user, self.role) + return "UserRole(uuid={0})".format(repr(self.uuid)) class Role(Base): @@ -97,7 +98,7 @@ class Role(Base): getset_factory=getset_factory) def __repr__(self): - return "" % self.name + return "Role(uuid={0})".format(repr(self.uuid)) def __unicode__(self): return unicode(self.name or '') @@ -124,7 +125,7 @@ class User(Base): getset_factory=getset_factory) def __repr__(self): - return "" % self.username + return "User(uuid={0})".format(repr(self.uuid)) def __unicode__(self): return unicode(self.username or '') diff --git a/edbob/db/extensions/contact/model.py b/edbob/db/extensions/contact/model.py index 8cd05de..6576b5c 100644 --- a/edbob/db/extensions/contact/model.py +++ b/edbob/db/extensions/contact/model.py @@ -72,7 +72,8 @@ class PhoneNumber(Base): __mapper_args__ = {'polymorphic_on': parent_type} def __repr__(self): - return "<%s: %s>" % (self.__class__.__name__, self.number) + return "{0}(uuid={1})".format( + self.__class__.__name__, repr(self.uuid)) def __unicode__(self): return unicode(self.number) @@ -103,7 +104,8 @@ class EmailAddress(Base): __mapper_args__ = {'polymorphic_on': parent_type} def __repr__(self): - return "<%s: %s>" % (self.__class__.__name__, self.address) + return "{0}(uuid={1})".format( + self.__class__.__name__, repr(self.uuid)) def __unicode__(self): return unicode(self.address) @@ -131,7 +133,7 @@ class Person(Base): display_name = Column(String(100), default=get_person_display_name) def __repr__(self): - return "" % self.display_name + return "Person(uuid={0})".format(repr(self.uuid)) def __unicode__(self): return unicode(self.display_name or '') diff --git a/edbob/db/model.py b/edbob/db/model.py index a077ba0..b5222c3 100644 --- a/edbob/db/model.py +++ b/edbob/db/model.py @@ -54,7 +54,7 @@ class ActiveExtension(Base): name = Column(String(50), primary_key=True) def __repr__(self): - return "" % self.name + return "ActiveExtension(name={0})".format(repr(self.name)) def __str__(self): return str(self.name or '') @@ -71,4 +71,4 @@ class Setting(Base): value = Column(Text) def __repr__(self): - return "" % self.name + return "Setting(name={0})".format(repr(self.name))