summaryrefslogtreecommitdiff
path: root/src/mailman/model/user.py
diff options
context:
space:
mode:
authorBarry Warsaw2012-03-15 15:48:41 -0700
committerBarry Warsaw2012-03-15 15:48:41 -0700
commitac0f1c3916e797f3a2261e9a2631e496fb90a8f1 (patch)
tree441a8e2b32de59f466a837f072120c36c92f60d4 /src/mailman/model/user.py
parent0589c867988dc70cbe83a53bc9d1e2bbf3108b82 (diff)
downloadmailman-ac0f1c3916e797f3a2261e9a2631e496fb90a8f1.tar.gz
mailman-ac0f1c3916e797f3a2261e9a2631e496fb90a8f1.tar.zst
mailman-ac0f1c3916e797f3a2261e9a2631e496fb90a8f1.zip
Diffstat (limited to 'src/mailman/model/user.py')
-rw-r--r--src/mailman/model/user.py16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/mailman/model/user.py b/src/mailman/model/user.py
index d1f59f957..11c719eea 100644
--- a/src/mailman/model/user.py
+++ b/src/mailman/model/user.py
@@ -51,7 +51,7 @@ class User(Model):
implements(IUser)
id = Int(primary=True)
- real_name = Unicode()
+ display_name = Unicode()
password = RawStr()
_user_id = UUID()
_created_on = DateTime()
@@ -62,20 +62,20 @@ class User(Model):
preferences_id = Int()
preferences = Reference(preferences_id, 'Preferences.id')
- def __init__(self, real_name=None, preferences=None):
+ def __init__(self, display_name=None, preferences=None):
super(User, self).__init__()
self._created_on = date_factory.now()
user_id = uid_factory.new_uid()
assert config.db.store.find(User, _user_id=user_id).count() == 0, (
'Duplicate user id {0}'.format(user_id))
self._user_id = user_id
- self.real_name = ('' if real_name is None else real_name)
+ self.display_name = ('' if display_name is None else display_name)
self.preferences = preferences
config.db.store.add(self)
def __repr__(self):
short_user_id = self.user_id.int
- return '<User "{0.real_name}" ({2}) at {1:#x}>'.format(
+ return '<User "{0.display_name}" ({2}) at {1:#x}>'.format(
self, id(self), short_user_id)
@property
@@ -132,14 +132,14 @@ class User(Model):
assert found.count() == 1, 'Unexpected count'
return found[0].user is self
- def register(self, email, real_name=None):
+ def register(self, email, display_name=None):
"""See `IUser`."""
# First, see if the address already exists
address = config.db.store.find(Address, email=email).one()
if address is None:
- if real_name is None:
- real_name = ''
- address = Address(email=email, real_name=real_name)
+ if display_name is None:
+ display_name = ''
+ address = Address(email=email, display_name=display_name)
address.preferences = Preferences()
# Link the address to the user if it is not already linked.
if address.user is not None: