fixup! Remove some unnecessary defer rounds

Author: flaeppe

tests/typecheck/fields/test_related.yml

@@ -748,9 +748,9 @@
                 class TransactionLog(models.Model):
                     transaction = models.ForeignKey(Transaction, on_delete=models.CASCADE)
     out: |
-        myapp/models:11: error: Could not resolve manager type for "myapp.models.Transaction.objects"  [django-manager-missing]
         myapp/models:13: note: Revealed type is "django.db.models.fields.related_descriptors.RelatedManager[myapp.models.TransactionLog]"
-        myapp/models:15: note: Revealed type is "myapp.models.UnknownManager[myapp.models.Transaction]"
+        myapp/models:15: note: Revealed type is "django.db.models.manager.BaseManager[Any]"
+        myapp/models:16: error: "BaseManager[Any]" has no attribute "custom"  [attr-defined]
         myapp/models:16: note: Revealed type is "Any"
 
 

tests/typecheck/managers/test_managers.yml

@@ -519,7 +519,7 @@
                     reveal_type(user.bookingowner_set)
                     reveal_type(user.booking_set)
 
-                    # Check QuerySet methods on UnknownManager
+                    # Check QuerySet methods on unknown manager
                     reveal_type(Booking.objects.all)
                     reveal_type(Booking.objects.custom)
                     reveal_type(Booking.objects.all().filter)
@@ -539,30 +539,27 @@
     out: |
         myapp/models:13: error: Couldn't resolve related manager 'booking_set' for relation 'myapp.models.Booking.renter'.  [django-manager-missing]
         myapp/models:13: error: Couldn't resolve related manager 'bookingowner_set' for relation 'myapp.models.Booking.owner'.  [django-manager-missing]
-        myapp/models:20: error: Could not resolve manager type for "myapp.models.Booking.objects"  [django-manager-missing]
-        myapp/models:23: error: Could not resolve manager type for "myapp.models.TwoUnresolvable.objects"  [django-manager-missing]
-        myapp/models:24: error: Could not resolve manager type for "myapp.models.TwoUnresolvable.second_objects"  [django-manager-missing]
-        myapp/models:27: error: Could not resolve manager type for "myapp.models.AbstractUnresolvable.objects"  [django-manager-missing]
-        myapp/models:32: error: Could not resolve manager type for "myapp.models.InvisibleUnresolvable.objects"  [django-manager-missing]
         myapp/models:36: note: Revealed type is "django.db.models.manager.Manager[myapp.models.User]"
         myapp/models:37: note: Revealed type is "django.db.models.manager.Manager[myapp.models.User]"
-        myapp/models:39: note: Revealed type is "myapp.models.UnknownManager[myapp.models.Booking]"
+        myapp/models:39: note: Revealed type is "django.db.models.manager.Manager[Any]"
         myapp/models:40: note: Revealed type is "django.db.models.manager.Manager[myapp.models.Booking]"
-        myapp/models:42: note: Revealed type is "myapp.models.UnknownManager[myapp.models.TwoUnresolvable]"
-        myapp/models:43: note: Revealed type is "myapp.models.UnknownManager[myapp.models.TwoUnresolvable]"
+        myapp/models:42: note: Revealed type is "django.db.models.manager.Manager[Any]"
+        myapp/models:43: note: Revealed type is "django.db.models.manager.Manager[Any]"
         myapp/models:44: note: Revealed type is "django.db.models.manager.Manager[myapp.models.TwoUnresolvable]"
-        myapp/models:46: note: Revealed type is "myapp.models.UnknownManager[myapp.models.InvisibleUnresolvable]"
+        myapp/models:46: note: Revealed type is "django.db.models.manager.Manager[Any]"
         myapp/models:47: note: Revealed type is "django.db.models.manager.Manager[myapp.models.InvisibleUnresolvable]"
         myapp/models:49: note: Revealed type is "django.db.models.fields.related_descriptors.RelatedManager[myapp.models.Booking]"
         myapp/models:50: note: Revealed type is "django.db.models.fields.related_descriptors.RelatedManager[myapp.models.Booking]"
-        myapp/models:53: note: Revealed type is "def () -> myapp.models.UnknownQuerySet[myapp.models.Booking, myapp.models.Booking]"
+        myapp/models:53: note: Revealed type is "def () -> django.db.models.query.QuerySet[Any, Any]"
+        myapp/models:54: error: "Manager[Any]" has no attribute "custom"  [attr-defined]
         myapp/models:54: note: Revealed type is "Any"
-        myapp/models:55: note: Revealed type is "def (*args: Any, **kwargs: Any) -> myapp.models.UnknownQuerySet[myapp.models.Booking, myapp.models.Booking]"
+        myapp/models:55: note: Revealed type is "def (*args: Any, **kwargs: Any) -> django.db.models.query.QuerySet[Any, Any]"
+        myapp/models:56: error: "QuerySet[Any, Any]" has no attribute "custom"  [attr-defined]
         myapp/models:56: note: Revealed type is "Any"
-        myapp/models:57: note: Revealed type is "Union[myapp.models.Booking, None]"
-        myapp/models:58: note: Revealed type is "myapp.models.Booking"
-        myapp/models:59: note: Revealed type is "builtins.list[myapp.models.Booking]"
-        myapp/models:60: note: Revealed type is "builtins.list[myapp.models.Booking]"
+        myapp/models:57: note: Revealed type is "Union[Any, None]"
+        myapp/models:58: note: Revealed type is "Any"
+        myapp/models:59: note: Revealed type is "builtins.list[Any]"
+        myapp/models:60: note: Revealed type is "builtins.list[Any]"
         myapp/models:64: note: Revealed type is "def () -> django.db.models.query.QuerySet[myapp.models.Booking, myapp.models.Booking]"
         myapp/models:65: error: "RelatedManager[Booking]" has no attribute "custom"  [attr-defined]
         myapp/models:65: note: Revealed type is "Any"