Ticket #14492: model_eq_14233.diff

django/db/models/base.py

@@ -370 +370 @@
         return '%s object' % self.__class__.__name__
 
     def __eq__(self, other):
-        return isinstance(other, self.__class__) and self._get_pk_val() == other._get_pk_val()
+        if isinstance(other, self.__class__):
+            return self._get_pk_val() == other._get_pk_val()
 
+        # self is proxy, other is not
+        proxy = self._meta.proxy_for_model
+        if self._meta.proxy is True and isinstance(other, proxy):
+            return self._get_pk_val() == other._get_pk_val()
+
+        # other is proxy, self is not
+        proxy = other._meta.proxy_for_model
+        if other._meta.proxy is True and isinstance(self, proxy):
+            return self._get_pk_val() == other._get_pk_val()
+        return False
+
     def __ne__(self, other):
         return not self.__eq__(other)