fix merge artifact

This commit is contained in:
Maxim Kurnikov
2019-07-24 22:05:05 +03:00
parent 6332620443
commit e6d7a570e8
2 changed files with 4 additions and 4 deletions

View File

@@ -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

View File

@@ -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(