lance/edbob
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Updated `repr()` output for model classes.

Browse source
This commit is contained in:
Lance Edgar 2013-05-17 12:21:39 -07:00
parent 3bfda431fa
commit 3766dbfff1
3 changed files with 12 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

9
edbob/db/extensions/auth/model.py
View file

@ -51,7 +51,8 @@ class Permission(Base):
permission = Column(String(50), primary_key=True) permission = Column(String(50), primary_key=True)
def __repr__(self): def __repr__(self):
return "<Permission: %s, %s>" % (self.role, self.permission) return "Permission(role_uuid={0}, permission={1})".format(
repr(self.role_uuid), repr(self.permission))
def __unicode__(self): def __unicode__(self):
return unicode(self.permission or '') return unicode(self.permission or '')
@ -69,7 +70,7 @@ class UserRole(Base):
role_uuid = Column(String(32), ForeignKey('roles.uuid')) role_uuid = Column(String(32), ForeignKey('roles.uuid'))
def __repr__(self): def __repr__(self):
return "<UserRole: %s : %s>" % (self.user, self.role) return "UserRole(uuid={0})".format(repr(self.uuid))
class Role(Base): class Role(Base):
@ -97,7 +98,7 @@ class Role(Base):
getset_factory=getset_factory) getset_factory=getset_factory)
def __repr__(self): def __repr__(self):
return "<Role: %s>" % self.name return "Role(uuid={0})".format(repr(self.uuid))
def __unicode__(self): def __unicode__(self):
return unicode(self.name or '') return unicode(self.name or '')
@ -124,7 +125,7 @@ class User(Base):
getset_factory=getset_factory) getset_factory=getset_factory)
def __repr__(self): def __repr__(self):
return "<User: %s>" % self.username return "User(uuid={0})".format(repr(self.uuid))
def __unicode__(self): def __unicode__(self):
return unicode(self.username or '') return unicode(self.username or '')

8
edbob/db/extensions/contact/model.py
View file

@ -72,7 +72,8 @@ class PhoneNumber(Base):
__mapper_args__ = {'polymorphic_on': parent_type} __mapper_args__ = {'polymorphic_on': parent_type}
def __repr__(self): 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): def __unicode__(self):
return unicode(self.number) return unicode(self.number)
@ -103,7 +104,8 @@ class EmailAddress(Base):
__mapper_args__ = {'polymorphic_on': parent_type} __mapper_args__ = {'polymorphic_on': parent_type}
def __repr__(self): 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): def __unicode__(self):
return unicode(self.address) return unicode(self.address)
@ -131,7 +133,7 @@ class Person(Base):
display_name = Column(String(100), default=get_person_display_name) display_name = Column(String(100), default=get_person_display_name)
def __repr__(self): def __repr__(self):
return "<Person: %s>" % self.display_name return "Person(uuid={0})".format(repr(self.uuid))
def __unicode__(self): def __unicode__(self):
return unicode(self.display_name or '') return unicode(self.display_name or '')

4
edbob/db/model.py
View file

@ -54,7 +54,7 @@ class ActiveExtension(Base):
name = Column(String(50), primary_key=True) name = Column(String(50), primary_key=True)
def __repr__(self): def __repr__(self):
return "<ActiveExtension: %s>" % self.name return "ActiveExtension(name={0})".format(repr(self.name))
def __str__(self): def __str__(self):
return str(self.name or '') return str(self.name or '')
@ -71,4 +71,4 @@ class Setting(Base):
value = Column(Text) value = Column(Text)
def __repr__(self): def __repr__(self):
return "<Setting: %s>" % self.name return "Setting(name={0})".format(repr(self.name))