From e6d7a570e8a4767951c0f22bfb21cb425655b1e5 Mon Sep 17 00:00:00 2001 From: Maxim Kurnikov Date: Wed, 24 Jul 2019 22:05:05 +0300 Subject: [PATCH] fix merge artifact --- django-stubs/contrib/auth/base_user.pyi | 2 +- django-stubs/contrib/auth/models.pyi | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/django-stubs/contrib/auth/base_user.pyi b/django-stubs/contrib/auth/base_user.pyi index 945a60e..1cd79b0 100644 --- a/django-stubs/contrib/auth/base_user.pyi +++ b/django-stubs/contrib/auth/base_user.pyi @@ -4,7 +4,7 @@ from django.db.models.base import Model from django.db import models -_T = TypeVar('_T', bound=Model) +_T = TypeVar("_T", bound=Model) class BaseUserManager(models.Manager[_T]): @classmethod diff --git a/django-stubs/contrib/auth/models.pyi b/django-stubs/contrib/auth/models.pyi index 6c9d090..bbaeb89 100644 --- a/django-stubs/contrib/auth/models.pyi +++ b/django-stubs/contrib/auth/models.pyi @@ -1,11 +1,11 @@ -from typing import Any, List, Optional, Set, Tuple, Type, Union, TypeVar +from typing import Any, Collection, Optional, Set, Tuple, Type, TypeVar from django.contrib.auth.base_user import AbstractBaseUser as AbstractBaseUser, BaseUserManager as BaseUserManager +from django.contrib.auth.validators import UnicodeUsernameValidator from django.contrib.contenttypes.models import ContentType from django.db.models.base import Model from django.db.models.manager import EmptyManager -from django.contrib.auth.validators import UnicodeUsernameValidator from django.db import models def update_last_login(sender: Type[AbstractBaseUser], user: AbstractBaseUser, **kwargs: Any) -> None: ... @@ -28,7 +28,7 @@ class Group(models.Model): permissions: models.ManyToManyField = models.ManyToManyField(Permission) def natural_key(self): ... -_T = TypeVar('_T', bound=Model) +_T = TypeVar("_T", bound=Model) class UserManager(BaseUserManager[_T]): def create_user(