[processing] fixed last commit

volaya · volaya · commit ab6dd7447e51 · 2017-07-24T12:20:32.000+02:00
diff --git a/python/plugins/processing/tools/dataobjects.py b/python/plugins/processing/tools/dataobjects.py
@@ -75,7 +75,7 @@ def getSupportedOutputTableExtensions():
 
 def getRasterLayers(sorting=True):
     layers = QgsMapLayerRegistry.instance().mapLayers().values()
-    raster = [lay.layer() for lay in layers if lay.layer() is not None and canUseRasterLayer(lay.layer())]
+    raster = [lay for lay in layers if lay is not None and canUseRasterLayer(lay)]
     if sorting:
         return sorted(raster, key=lambda layer: layer.name().lower())
     else:
@@ -84,7 +84,7 @@ def getRasterLayers(sorting=True):
 
 def getVectorLayers(shapetype=[-1], sorting=True):
     layers = QgsMapLayerRegistry.instance().mapLayers().values()
-    vector = [lay.layer() for lay in layers if canUseVectorLayer(lay.layer(), shapetype)]
+    vector = [lay for lay in layers if canUseVectorLayer(lay, shapetype)]
     if sorting:
         return sorted(vector, key=lambda layer: layer.name().lower())
     else:
@@ -118,9 +118,8 @@ def getTables(sorting=True):
     layers = QgsMapLayerRegistry.instance().mapLayers().values()
     tables = []
     for layer in layers:
-        mapLayer = layer.layer()
-        if mapLayer.type() == QgsMapLayer.VectorLayer:
-            tables.append(mapLayer)
+        if layer.type() == QgsMapLayer.VectorLayer:
+            tables.append(layer)
     if sorting:
         return sorted(tables, key=lambda table: table.name().lower())
     else:
