1010from django .contrib .auth .forms import (
1111 AdminPasswordChangeForm as BaseAdminPasswordChangeForm ,
1212)
13+ from django .contrib .auth .models import User
1314
1415try :
1516 from django .contrib .auth .forms import AdminUserCreationForm as BaseUserCreationForm
@@ -70,11 +71,10 @@ def __init__(
7071class UserCreationForm (BaseUserCreationForm ):
7172 def __init__ (
7273 self ,
73- request : Optional [HttpRequest ] = None ,
7474 * args ,
7575 ** kwargs ,
7676 ) -> None :
77- super ().__init__ (request , * args , ** kwargs )
77+ super ().__init__ (* args , ** kwargs )
7878
7979 self .fields ["password1" ].widget = UnfoldAdminPasswordInput (
8080 attrs = {"autocomplete" : "new-password" }
@@ -92,11 +92,10 @@ def __init__(
9292class UserChangeForm (BaseUserChangeForm ):
9393 def __init__ (
9494 self ,
95- request : Optional [HttpRequest ] = None ,
9695 * args ,
9796 ** kwargs ,
9897 ) -> None :
99- super ().__init__ (request , * args , ** kwargs )
98+ super ().__init__ (* args , ** kwargs )
10099 self .fields ["password" ].widget = UnfoldReadOnlyPasswordHashWidget ()
101100
102101 self .fields ["password" ].help_text = _ (
@@ -113,19 +112,19 @@ def __init__(
113112class AdminPasswordChangeForm (BaseAdminPasswordChangeForm ):
114113 def __init__ (
115114 self ,
116- request : Optional [ HttpRequest ] = None ,
115+ user : User ,
117116 * args ,
118117 ** kwargs ,
119118 ) -> None :
120- super ().__init__ (request , * args , ** kwargs )
119+ super ().__init__ (user , * args , ** kwargs )
121120
122121 self .fields ["password1" ].widget .attrs ["class" ] = " " .join (INPUT_CLASSES )
123122 self .fields ["password2" ].widget .attrs ["class" ] = " " .join (INPUT_CLASSES )
124123
125124
126125class AdminOwnPasswordChangeForm (BaseAdminOwnPasswordChangeForm ):
127- def __init__ (self , * args , ** kwargs ) -> None :
128- super ().__init__ (kwargs . pop ( " user" ) , * args , ** kwargs )
126+ def __init__ (self , user : User , * args , ** kwargs ) -> None :
127+ super ().__init__ (user , * args , ** kwargs )
129128
130129 self .fields ["old_password" ].widget .attrs ["class" ] = " " .join (INPUT_CLASSES )
131130 self .fields ["new_password1" ].widget .attrs ["class" ] = " " .join (INPUT_CLASSES )
0 commit comments