summaryrefslogtreecommitdiff
path: root/src/mailman/model/user.py
diff options
context:
space:
mode:
authorBarry Warsaw2016-07-29 19:28:46 -0400
committerBarry Warsaw2016-07-29 19:28:46 -0400
commitfebb5289e82c4424cdbcc2297e967bd894cbc8cf (patch)
treebd71f4cbf6988049ac4d5dd65ceb7d5cc51902e7 /src/mailman/model/user.py
parent90e84bee5f47cbcdb9e9c367c60a877e325ef3e7 (diff)
downloadmailman-febb5289e82c4424cdbcc2297e967bd894cbc8cf.tar.gz
mailman-febb5289e82c4424cdbcc2297e967bd894cbc8cf.tar.zst
mailman-febb5289e82c4424cdbcc2297e967bd894cbc8cf.zip
Diffstat (limited to 'src/mailman/model/user.py')
-rw-r--r--src/mailman/model/user.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mailman/model/user.py b/src/mailman/model/user.py
index a534ef2a5..edda2a9e8 100644
--- a/src/mailman/model/user.py
+++ b/src/mailman/model/user.py
@@ -20,7 +20,7 @@
from mailman import public
from mailman.database.model import Model
from mailman.database.transaction import dbconnection
-from mailman.database.types import UUID
+from mailman.database.types import SAUnicode, UUID
from mailman.interfaces.address import (
AddressAlreadyLinkedError, AddressNotLinkedError)
from mailman.interfaces.user import (
@@ -32,7 +32,7 @@ from mailman.model.roster import Memberships
from mailman.utilities.datetime import factory as date_factory
from mailman.utilities.uid import UIDFactory
from sqlalchemy import (
- Boolean, Column, DateTime, ForeignKey, Integer, Unicode)
+ Boolean, Column, DateTime, ForeignKey, Integer)
from sqlalchemy.orm import backref, relationship
from zope.event import notify
from zope.interface import implementer
@@ -49,8 +49,8 @@ class User(Model):
__tablename__ = 'user'
id = Column(Integer, primary_key=True)
- display_name = Column(Unicode)
- _password = Column('password', Unicode)
+ display_name = Column(SAUnicode)
+ _password = Column('password', SAUnicode)
_user_id = Column(UUID, index=True)
_created_on = Column(DateTime)
is_server_owner = Column(Boolean, default=False)