From 26ca612880cfa179bad17e0a399d5ef2d9a0914e Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Mon, 5 Feb 2024 12:09:41 -0500 Subject: [PATCH] Tweak import to avoid class name collision --- netbox/users/models.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/netbox/users/models.py b/netbox/users/models.py index 847e9ea81..5e817be0b 100644 --- a/netbox/users/models.py +++ b/netbox/users/models.py @@ -3,7 +3,9 @@ import os from django.conf import settings from django.contrib.auth import get_user_model -from django.contrib.auth.models import AbstractUser, Group, GroupManager, User as DjangoUser, UserManager +from django.contrib.auth.models import ( + AbstractUser, Group, GroupManager, User as DjangoUser, UserManager as DjangoUserManager +) from django.contrib.postgres.fields import ArrayField from django.core.exceptions import ValidationError from django.core.validators import MinLengthValidator @@ -35,7 +37,7 @@ __all__ = ( # Proxies for Django's User and Group models # -class UserManager(UserManager.from_queryset(RestrictedQuerySet)): +class UserManager(DjangoUserManager.from_queryset(RestrictedQuerySet)): pass