Skip to content

Commit

Permalink
Merge pull request #5745 from alexbruy/processing-cleanup
Browse files Browse the repository at this point in the history 
Processing cleanup
  • Loading branch information
@alexbruy
alexbruy committed Nov 29, 2017
2 parents 29bfb10 + d65c036 commit e0290a9
Show file tree
Hide file tree
Showing 122 changed files with 84 additions and 2,174 deletions.
3 changes: 1 addition & 2 deletions python/plugins/processing/ProcessingPlugin.py
View file
Expand Up @@ -16,7 +16,6 @@
* *
***************************************************************************
"""
from builtins import object

__author__ = 'Victor Olaya'
__date__ = 'August 2012'
Expand Down Expand Up @@ -160,7 +159,7 @@ def createDataItem(self, path, parentItem):
return None


class ProcessingPlugin(object):
class ProcessingPlugin:

def __init__(self, iface):
self.iface = iface
Expand Down
3 changes: 1 addition & 2 deletions python/plugins/processing/algs/exampleprovider/ProcessingExampleProviderPlugin.py
View file
Expand Up @@ -16,7 +16,6 @@
* *
***************************************************************************
"""
from builtins import object

__author__ = 'Victor Olaya'
__date__ = 'July 2013'
Expand All @@ -40,7 +39,7 @@
sys.path.insert(0, cmd_folder)


class ProcessingExampleProviderPlugin(object):
class ProcessingExampleProviderPlugin:

def __init__(self):
self.provider = ExampleAlgorithmProvider()
Expand Down
3 changes: 1 addition & 2 deletions python/plugins/processing/algs/examplescripts/ProcessingExampleScriptsPlugin.py
View file
Expand Up @@ -16,7 +16,6 @@
* *
***************************************************************************
"""
from builtins import object

__author__ = 'Victor Olaya'
__date__ = 'May 2016'
Expand All @@ -31,7 +30,7 @@
from processing.core.Processing import Processing


class ProcessingExampleScriptsPlugin(object):
class ProcessingExampleScriptsPlugin:

def initGui(self):
Processing.addScripts(os.path.join(os.path.dirname(__file__), "scripts"))
Expand Down
5 changes: 1 addition & 4 deletions python/plugins/processing/algs/gdal/GdalUtils.py
View file
Expand Up @@ -16,9 +16,6 @@
* *
***************************************************************************
"""
from builtins import str
from builtins import range
from builtins import object

__author__ = 'Victor Olaya'
__date__ = 'August 2012'
Expand Down Expand Up @@ -57,7 +54,7 @@
gdalAvailable = False


class GdalUtils(object):
class GdalUtils:
GDAL_HELP_PATH = 'GDAL_HELP_PATH'

supportedRasters = None
Expand Down
1 change: 0 additions & 1 deletion python/plugins/processing/algs/gdal/extractprojection.py
View file
Expand Up @@ -16,7 +16,6 @@
* *
***************************************************************************
"""
from builtins import str

__author__ = 'Alexander Bruy'
__date__ = 'September 2013'
Expand Down
8 changes: 1 addition & 7 deletions python/plugins/processing/algs/gdal/gdalcalc.py
View file
Expand Up @@ -16,7 +16,6 @@
* *
***************************************************************************
"""
from builtins import str

__author__ = 'Giovanni Manghi'
__date__ = 'January 2015'
Expand All @@ -27,15 +26,10 @@
__revision__ = '$Format:%H$'

from processing.algs.gdal.GdalAlgorithm import GdalAlgorithm
from processing.core.parameters import ParameterString
from processing.core.parameters import ParameterRaster
from processing.core.parameters import ParameterSelection
from processing.core.outputs import OutputRaster
from processing.algs.gdal.GdalUtils import GdalUtils

from processing.tools.system import isWindows

from processing.algs.gdal.GdalUtils import GdalUtils


class gdalcalc(GdalAlgorithm):

Expand Down
1 change: 0 additions & 1 deletion python/plugins/processing/algs/gdal/nearblack.py
View file
Expand Up @@ -16,7 +16,6 @@
* *
***************************************************************************
"""
from builtins import str

__author__ = 'Victor Olaya'
__date__ = 'August 2012'
Expand Down
7 changes: 0 additions & 7 deletions python/plugins/processing/algs/gdal/ogr2ogrtabletopostgislist.py
View file
Expand Up @@ -16,7 +16,6 @@
* *
***************************************************************************
"""
from builtins import str

__author__ = 'Victor Olaya'
__date__ = 'November 2012'
Expand All @@ -28,12 +27,6 @@

from qgis.core import QgsSettings

from processing.core.parameters import ParameterString
from processing.core.parameters import ParameterTable
from processing.core.parameters import ParameterSelection
from processing.core.parameters import ParameterBoolean
from processing.core.parameters import ParameterTableField

from processing.algs.gdal.GdalAlgorithm import GdalAlgorithm
from processing.algs.gdal.GdalUtils import GdalUtils

Expand Down
9 changes: 0 additions & 9 deletions python/plugins/processing/algs/gdal/ogr2ogrtopostgislist.py
View file
Expand Up @@ -25,15 +25,6 @@

__revision__ = '$Format:%H$'


from processing.core.parameters import ParameterVector
from processing.core.parameters import ParameterString
from processing.core.parameters import ParameterCrs
from processing.core.parameters import ParameterSelection
from processing.core.parameters import ParameterBoolean
from processing.core.parameters import ParameterExtent
from processing.core.parameters import ParameterTableField

from processing.algs.gdal.GdalAlgorithm import GdalAlgorithm
from processing.algs.gdal.GdalUtils import GdalUtils

Expand Down
10 changes: 1 addition & 9 deletions python/plugins/processing/algs/gdal/rasterize.py
View file
Expand Up @@ -16,7 +16,7 @@
* *
***************************************************************************
"""
from builtins import str


__author__ = 'Alexander Bruy'
__date__ = 'September 2013'
Expand All @@ -30,14 +30,6 @@

from qgis.PyQt.QtGui import QIcon

from processing.core.parameters import (ParameterVector,
ParameterExtent,
ParameterTableField,
ParameterSelection,
ParameterNumber,
ParameterString)
from processing.core.outputs import OutputRaster

from processing.algs.gdal.GdalAlgorithm import GdalAlgorithm
from processing.algs.gdal.GdalUtils import GdalUtils

Expand Down
5 changes: 0 additions & 5 deletions python/plugins/processing/algs/gdal/rasterize_over.py
View file
Expand Up @@ -16,7 +16,6 @@
* *
***************************************************************************
"""
from builtins import str

__author__ = 'Alexander Bruy'
__date__ = 'September 2013'
Expand All @@ -32,10 +31,6 @@

from qgis.PyQt.QtGui import QIcon

from processing.core.parameters import ParameterVector
from processing.core.parameters import ParameterRaster
from processing.core.parameters import ParameterTableField

from processing.algs.gdal.GdalAlgorithm import GdalAlgorithm
from processing.algs.gdal.GdalUtils import GdalUtils

Expand Down
2 changes: 0 additions & 2 deletions python/plugins/processing/algs/grass7/Grass7Algorithm.py
View file
Expand Up @@ -16,8 +16,6 @@
* *
***************************************************************************
"""
from builtins import str
from builtins import range

__author__ = 'Victor Olaya'
__date__ = 'February 2015'
Expand Down
3 changes: 0 additions & 3 deletions python/plugins/processing/algs/grass7/Grass7AlgorithmProvider.py
View file
Expand Up @@ -16,7 +16,6 @@
* *
***************************************************************************
"""
from builtins import str

__author__ = 'Victor Olaya'
__date__ = 'April 2014'
Expand All @@ -37,7 +36,6 @@
from .Grass7Utils import Grass7Utils
from .Grass7Algorithm import Grass7Algorithm
from processing.tools.system import isWindows, isMac
#from .nviz7 import nviz7

pluginPath = os.path.normpath(os.path.join(
os.path.split(os.path.dirname(__file__))[0], os.pardir))
Expand Down Expand Up @@ -110,7 +108,6 @@ def createAlgsList(self):
except Exception as e:
QgsMessageLog.logMessage(
self.tr('Could not open GRASS GIS 7 algorithm: {0}\n{1}').format(descriptionFile, str(e)), self.tr('Processing'), QgsMessageLog.CRITICAL)
#algs.append(nviz7())
return algs

def loadAlgorithms(self):
Expand Down
4 changes: 1 addition & 3 deletions python/plugins/processing/algs/grass7/Grass7Utils.py
View file
Expand Up @@ -16,8 +16,6 @@
* *
***************************************************************************
"""
from builtins import str
from builtins import object

__author__ = 'Victor Olaya'
__date__ = 'February 2015'
Expand All @@ -43,7 +41,7 @@
from processing.algs.gdal.GdalUtils import GdalUtils


class Grass7Utils(object):
class Grass7Utils:

GRASS_REGION_XMIN = 'GRASS7_REGION_XMIN'
GRASS_REGION_YMIN = 'GRASS7_REGION_YMIN'
Expand Down
1 change: 0 additions & 1 deletion python/plugins/processing/algs/grass7/ext/r_blend_rgb.py
View file
Expand Up @@ -16,7 +16,6 @@
* *
***************************************************************************
"""
from builtins import str

__author__ = 'Médéric Ribreux'
__date__ = 'February 2016'
Expand Down
1 change: 0 additions & 1 deletion python/plugins/processing/algs/grass7/ext/r_category.py
View file
Expand Up @@ -16,7 +16,6 @@
* *
***************************************************************************
"""
from builtins import str

__author__ = 'Médéric Ribreux'
__date__ = 'February 2016'
Expand Down
1 change: 0 additions & 1 deletion python/plugins/processing/algs/grass7/ext/r_colors.py
View file
Expand Up @@ -16,7 +16,6 @@
* *
***************************************************************************
"""
from builtins import str

__author__ = 'Médéric Ribreux'
__date__ = 'February 2016'
Expand Down
1 change: 0 additions & 1 deletion python/plugins/processing/algs/grass7/ext/r_colors_stddev.py
View file
Expand Up @@ -16,7 +16,6 @@
* *
***************************************************************************
"""
from builtins import str

__author__ = 'Médéric Ribreux'
__date__ = 'February 2016'
Expand Down
1 change: 0 additions & 1 deletion python/plugins/processing/algs/grass7/ext/r_null.py
View file
Expand Up @@ -16,7 +16,6 @@
* *
***************************************************************************
"""
from builtins import str

__author__ = 'Médéric Ribreux'
__date__ = 'February 2016'
Expand Down
1 change: 0 additions & 1 deletion python/plugins/processing/algs/grass7/ext/r_shade.py
View file
Expand Up @@ -16,7 +16,6 @@
* *
***************************************************************************
"""
from builtins import str

__author__ = 'Médéric Ribreux'
__date__ = 'February 2016'
Expand Down
1 change: 0 additions & 1 deletion python/plugins/processing/algs/grass7/ext/r_statistics.py
View file
Expand Up @@ -16,7 +16,6 @@
* *
***************************************************************************
"""
from builtins import str

__author__ = 'Médéric Ribreux'
__date__ = 'September 2017'
Expand Down
1 change: 0 additions & 1 deletion python/plugins/processing/algs/grass7/ext/r_stats_quantile_rast.py
View file
Expand Up @@ -16,7 +16,6 @@
* *
***************************************************************************
"""
from builtins import range

__author__ = 'Médéric Ribreux'
__date__ = 'February 2016'
Expand Down
1 change: 0 additions & 1 deletion python/plugins/processing/algs/grass7/ext/r_what_color.py
View file
Expand Up @@ -16,7 +16,6 @@
* *
***************************************************************************
"""
from builtins import str

__author__ = 'Médéric Ribreux'
__date__ = 'February 2016'
Expand Down
1 change: 0 additions & 1 deletion python/plugins/processing/algs/grass7/ext/v_net_connectivity.py
View file
Expand Up @@ -16,7 +16,6 @@
* *
***************************************************************************
"""
from builtins import range

__author__ = 'Médéric Ribreux'
__date__ = 'December 2015'
Expand Down

0 comments on commit e0290a9

Please sign in to comment.