Django

Code

Changeset 5633

Show
Ignore:
Timestamp:
07/08/07 02:06:53 (1 year ago)
Author:
jdunck
Message:

gis: Switched back to non-generator getitem, since even specific-item index returned generator.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/branches/gis/django/contrib/gis/gdal/Layer.py

    r5613 r5633  
    4949            if index < 0 or index >= self.num_feat: 
    5050                raise IndexError, 'index out of range' 
    51             yield make_feature(index) 
     51            return make_feature(index) 
    5252        else:  
    5353            # A slice was given 
    5454            start, stop, stride = index.indices(end) 
    55             for offset in xrange(start,stop,stride): 
    56                 yield make_feature(offset) 
     55            return [make_feature(offset) for offset in range(start,stop,stride)] 
    5756 
    5857    def __iter__(self): 
    5958        "Iterates over each Feature in the Layer." 
    60         # Resetting the Layer before beginning iteration 
    61         lgdal.OGR_L_ResetReading(self._layer) 
    62  
    63         return self.__getitem__(slice(self.num_feat)) 
     59        #TODO: is OGR's GetNextFeature faster here? 
     60        for i in range(self.num_feat): 
     61            yield self.__getitem__(i) 
    6462 
    6563    def __len__(self):