Ticket #16134: 16134_fix.diff

tests/regressiontests/model_fields/tests.py

@@ -23 +23 @@
 
 
 class BasicFieldTests(test.TestCase):
+    def test_field_can_compare_null(self):
+        """
+        Regression test for #16134. Checks to see if a field can be compared with None.
+        """
+        field = models.Field()
+        
+        self.assertNotEqual(field,None)
+        self.assertNotEqual(cmp(field,None),0)
+    
     def test_show_hidden_initial(self):
         """
         Regression test for #12913. Make sure fields with choices respect

django/db/models/fields/__init__.py

@@ -117 +117 @@
         self.error_messages = messages
 
     def __cmp__(self, other):
+        if not hasattr(other, 'creation_counter'):
+            return super(self).cmp(self, other)
         # This is needed because bisect does not take a comparison function.
         return cmp(self.creation_counter, other.creation_counter)