Navigation

Changeset 9284

Timestamp:

10/26/08 17:24:21 (3 months ago)

Author:

jbronn

Message:

Fixed #9448 -- Layer objects now carry a reference to their parent DataSource. Thanks, Matthew D. Hancher for the bug report.

Files:

r8219	r9284
112	112	else:
113	113	raise TypeError('Invalid index type: %s' % type(index))
114		return Layer(l)
	114	return Layer(l, self)
115	115
116	116	def __len__(self):

r8219	r9284
26	26
27	27	#### Python 'magic' routines ####
28		def __init__(self, layer_ptr):
29		"Needs a C pointer (Python/ctypes integer) in order to initialize."
	28	def __init__(self, layer_ptr, ds):
	29	"""
	30	Initializes on an OGR C pointer to the Layer and the `DataSource` object
	31	that owns this layer. The `DataSource` object is required so that a
	32	reference to it is kept with this Layer. This prevents garbage
	33	collection of the `DataSource` while this Layer is still active.
	34	"""
30	35	self._ptr = None # Initially NULL
31	36	if not layer_ptr:
32	37	raise OGRException('Cannot create Layer, invalid pointer given')
33	38	self._ptr = layer_ptr
	39	self._ds = ds
34	40	self._ldefn = get_layer_defn(self._ptr)
35	41	# Does the Layer support random reading?

r8219	r9284
131	131	self.assertEqual(control_vals, test_vals)
132	132
	133	def test03c_layer_references(self):
	134	"Test to make sure Layer access is still available without the DataSource."
	135	source = ds_list[0]
	136
	137	# See ticket #9448.
	138	def get_layer():
	139	# This DataSource object is not accessible outside this
	140	# scope. However, a reference should still be kept alive
	141	# on the `Layer` returned.
	142	ds = DataSource(source.ds)
	143	return ds[0]
	144
	145	# Making sure we can call OGR routines on the Layer returned.
	146	lyr = get_layer()
	147	self.assertEqual(source.nfeat, len(lyr))
	148	self.assertEqual(source.gtype, lyr.geom_type.num)
	149
133	150	def test04_features(self):
134	151	"Testing Data Source Features."