Merge branch 'main' into rjm/2351-org-requests-page

src/registrar/management/commands/update_first_ready.py

@@ -1,6 +1,5 @@
 import logging
 from django.core.management import BaseCommand
-from django.db.models.manager import BaseManager
 from registrar.management.commands.utility.terminal_helper import PopulateScriptTemplate, TerminalColors
 from registrar.models import Domain, TransitionDomain
 
@@ -27,7 +26,7 @@ class Command(BaseCommand, PopulateScriptTemplate):
 
     # check if a transition domain object for this domain name exists,
     # or if so whether its first_ready value matches its created_at date
-    def custom_filter(self, records: BaseManager[Domain]) -> BaseManager[Domain]:
+    def custom_filter(self, records):
         to_include_pks = []
         for record in records:
             if (

src/registrar/management/commands/utility/terminal_helper.py

@@ -78,7 +78,7 @@ class PopulateScriptTemplate(ABC):
     run_summary_header = None
 
     @abstractmethod
-    def update_record(self, record: Model):
+    def update_record(self, record):
         """Defines how we update each field.
 
         raises:
@@ -86,7 +86,7 @@ class PopulateScriptTemplate(ABC):
         """
         raise NotImplementedError
 
-    def mass_update_records(self, object_class: Model, filter_conditions, fields_to_update, debug=True, verbose=False):
+    def mass_update_records(self, object_class, filter_conditions, fields_to_update, debug=True, verbose=False):
         """Loops through each valid "object_class" object - specified by filter_conditions - and
         updates fields defined by fields_to_update using update_record.