Ticket #5630: gis_geos_empty.diff

django/contrib/gis/geos/pointer.py

@@ -186 +186 @@
         n_child = len(ptr_list)
 
         # Determining whether coordinate sequences pointers were passed in.
-        if isinstance(ptr_list[0], (tuple, list)):
+        if n_child and isinstance(ptr_list[0], (tuple, list)):
             self._child_cs = True
         else:
             self._child_cs = False

django/contrib/gis/tests/test_geos.py

@@ -722 +722 @@
         mpoly = MultiPolygon(poly.clone(), poly)
         self.assertEqual(8.0, mpoly.length)
 
+    def test20_emptyCollections(self):
+        "Testing empty geometry collections"
+        g = GeometryCollection([])
+        self.assert_(g.empty)
+        self.assertEqual(0, g.num_geom)
+        
+        g = GEOSGeometry("GEOMETRYCOLLECTION EMPTY")
+        self.assert_(g.empty)
+        self.assert_(isinstance(g, GeometryCollection))
+        self.assertEqual(0, g.num_geom)
+        
 def suite():
     s = unittest.TestSuite()
     s.addTest(unittest.makeSuite(GEOSTest))
@@ -729 +740 @@
 
 def run(verbosity=2):
     unittest.TextTestRunner(verbosity=verbosity).run(suite())
+
+if __name__=="__main__":
+    unittest.main()