Skip to content
Permalink
Browse files

get rid of multiple inheritance, fix missed import

  • Loading branch information
alexbruy committed Jan 21, 2016
1 parent fe2bb2f commit cf02a71bb0d4e9e4a198259c77d5eb6b937e9c58
Showing with 4 additions and 4 deletions.
  1. +4 −4 python/plugins/processing/algs/gdal/ClipByMask.py
@@ -27,8 +27,6 @@

from osgeo import gdal

from processing.algs.gdal.GdalAlgorithm import GdalAlgorithm

from processing.core.parameters import ParameterRaster
from processing.core.parameters import ParameterVector
from processing.core.parameters import ParameterBoolean
@@ -41,8 +39,10 @@
from processing.algs.gdal.OgrAlgorithm import OgrAlgorithm
from processing.algs.gdal.GdalUtils import GdalUtils

from processing.tools import dataobjects


class ClipByMask(GdalAlgorithm, OgrAlgorithm):
class ClipByMask(OgrAlgorithm):

INPUT = 'INPUT'
OUTPUT = 'OUTPUT'
@@ -149,7 +149,7 @@ def getConsoleCommands(self):

arguments.append('-cutline')
arguments.append(ogrMask)
if maskLayer.subsetString() != '':
if maskLayer and maskLayer.subsetString() != '':
arguments.append('-cwhere')
arguments.append(maskLayer.subsetString())

0 comments on commit cf02a71

Please sign in to comment.
You can’t perform that action at this time.