Ticket #19366: 19366-1.diff

django/contrib/gis/geos/mutable_list.py

@@ -152 +152 @@
         for i in range(len(self)):
             try:
                 c = self[i] == other[i]
-            except IndexError:
+            except (IndexError, self._IndexError):
                 # must be other is shorter
                 return False
             if not c:
                 return False
-        return True
+        return len(self) == len(other)
 
     def __lt__(self, other):
         slen = len(self)
         for i in range(slen):
             try:
                 c = self[i] < other[i]
-            except IndexError:
+            except (IndexError, self._IndexError):
                 # must be other is shorter
                 return False
             if c:

django/contrib/gis/geos/tests/test_geos.py

@@ -451 +451 @@
             self.assertEqual(poly.wkt, Polygon(*tuple(r for r in poly)).wkt)
             self.assertEqual(poly.wkt, Polygon(*tuple(LinearRing(r.tuple) for r in poly)).wkt)
 
+    def test_polygon_comparison(self):
+        p1 = Polygon(((0, 0), (0, 1), (1, 1), (1, 0), (0, 0)))
+        p2 = Polygon(((0, 0), (0, 1), (1, 0), (0, 0)))
+        self.assertTrue(p1 > p2)
+        self.assertFalse(p1 < p2)
+
     def test_multipolygons(self):
         "Testing MultiPolygon objects."
         prev = fromstr('POINT (0 0)')

django/contrib/gis/geos/tests/test_mutable_list.py

@@ -363 +363 @@
 
         pl, ul = self.lists_of_len()
         self.assertEqual(pl, ul, 'cmp for equal')
+        self.assertFalse(ul == pl + [2], 'cmp for not equal')
         self.assertTrue(pl >= ul, 'cmp for gte self')
         self.assertTrue(pl <= ul, 'cmp for lte self')
         self.assertTrue(ul >= pl, 'cmp for self gte')
@@ -377 +378 @@
         self.assertTrue(ul < pl + [2], 'cmp')
         self.assertTrue(ul <= pl + [2], 'cmp')
 
+        # Also works with a custom IndexError
+        ul_longer = ul + [2]
+        ul_longer._IndexError = TypeError
+        ul._IndexError = TypeError
+        self.assertFalse(ul_longer == pl)
+        self.assertFalse(ul == ul_longer)
+        self.assertTrue(ul_longer > ul)
+
         pl[1] = 20
         self.assertTrue(pl > ul, 'cmp for gt self')
         self.assertTrue(ul < pl, 'cmp for self lt')