Context Navigation

Ticket #19366: 19366-3.diff

File 19366-3.diff, 4.1 KB (added by Craig de Stigter, 12 years ago)
19366-2.diff plus fix lt when geometries are different lengths

diff --git a/django/contrib/gis/geos/mutable_list.py b/django/contrib/gis/geos/mutable_list.py
index 820cdfa..b41a83a 100644

                class ListMixin(object):
         return self
     def __eq__(self, other):
+        for i in range(len(self)):
+        olen = len(other)
+        for i in range(olen):
             try:
                 c = self[i] == other[i]
             except IndexError:
                 # must be other is shorter
+            except self._IndexError:
+                # self must be shorter
                 return False
             if not c:
                 return False
         return True
+        return len(self) == olen
     def __lt__(self, other):
         slen = len(self)
         for i in range(slen):
+        olen = len(other)
+        for i in range(olen):
             try:
                 c = self[i] < other[i]
             except IndexError:
                 # must be other is shorter
                 return False
+            except self._IndexError:
+                # self must be shorter
+                return True
             if c:
                 return c
         return slen < len(other)
+        return len(self) < olen
     ### Public list interface Methods ###
     ## Non-mutating ##

diff --git a/django/contrib/gis/geos/tests/test_geos.py b/django/contrib/gis/geos/tests/test_geos.py
index 283daa4..ec320f9 100644

                class GEOSTest(unittest.TestCase, TestDataMixin):
             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)
+        self.assertFalse(p2 > p1)
+        self.assertTrue(p2 < p1)
+        p3 = Polygon(((0, 0), (0, 1), (1, 1), (2, 0), (0, 0)))
+        p4 = Polygon(((0, 0), (0, 1), (2, 2), (1, 0), (0, 0)))
+        self.assertFalse(p4 < p3)
+        self.assertTrue(p3 < p4)
+        self.assertTrue(p4 > p3)
+        self.assertFalse(p3 > p4)
     def test_multipolygons(self):
         "Testing MultiPolygon objects."
         prev = fromstr('POINT (0 0)')

diff --git a/django/contrib/gis/geos/tests/test_mutable_list.py b/django/contrib/gis/geos/tests/test_mutable_list.py
index 675505f..988d841 100644

                class ListMixinTest(unittest.TestCase):
         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')
-…
+               class ListMixinTest(unittest.TestCase):
         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')

diff --git a/django/contrib/gis/tests/__init__.py b/django/contrib/gis/tests/__init__.py
index 765c030..54c945d 100644

a	b	class GeoDjangoTestSuiteRunner(DjangoTestSuiteRunner):
121	121
122	122	def build_suite(self, test_labels, extra_tests=None, **kwargs):
123	123	return geodjango_suite()
	124
	125	from django.contrib.gis.geos.tests.test_geos import *