technicie/MarietjeDjango
1
0
Fork 0
mirror of https://gitlab.science.ru.nl/technicie/MarietjeDjango.git synced 2025-12-11 08:12:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'marietje-zuid' into 'marietje-zuid'

Browse Source 
Remove python2 compatibility library django.utils.six

See merge request dsprenkels/MarietjeDjango!45
This commit is contained in:
Gerdriaan Mulder
2020-03-28 14:09:16 +01:00
parent 95bd47c46a 59993aa1c0
commit 6ec3d57a39
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
marietje/marietje/models.py
View File

@ -1,10 +1,10 @@
from django.contrib.auth.base_user import AbstractBaseUser, BaseUserManager from django.contrib.auth.base_user import AbstractBaseUser, BaseUserManager
from django.contrib.auth.hashers import make_password from django.contrib.auth.hashers import make_password
from django.contrib.auth.models import PermissionsMixin from django.contrib.auth.models import PermissionsMixin
from django.contrib.auth.validators import ASCIIUsernameValidator, UnicodeUsernameValidator from django.contrib.auth.validators import UnicodeUsernameValidator
from django.core.mail import send_mail from django.core.mail import send_mail
from django.db import models from django.db import models
from django.utils import six, timezone from django.utils import timezone
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
from marietje.utils import get_first_queue from marietje.utils import get_first_queue
@ -46,7 +46,7 @@ class UserManager(BaseUserManager):
class User(AbstractBaseUser, PermissionsMixin): class User(AbstractBaseUser, PermissionsMixin):
username_validator = UnicodeUsernameValidator() if six.PY3 else ASCIIUsernameValidator() username_validator = UnicodeUsernameValidator()
username = models.CharField( username = models.CharField(
_('username'), _('username'),