Skip to content

Commit

Permalink
[processing] remove Python 2 compatibility layer
Browse files Browse the repository at this point in the history
  • Loading branch information
alexbruy committed Nov 28, 2017
1 parent 0f1f24a commit 0059b2b
Show file tree
Hide file tree
Showing 105 changed files with 45 additions and 170 deletions.
3 changes: 1 addition & 2 deletions python/plugins/processing/ProcessingPlugin.py
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
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
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
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
Expand Up @@ -16,7 +16,6 @@
* *
***************************************************************************
"""
from builtins import str

__author__ = 'Alexander Bruy'
__date__ = 'September 2013'
Expand Down
1 change: 0 additions & 1 deletion python/plugins/processing/algs/gdal/gdalcalc.py
Expand Up @@ -16,7 +16,6 @@
* *
***************************************************************************
"""
from builtins import str

__author__ = 'Giovanni Manghi'
__date__ = 'January 2015'
Expand Down
1 change: 0 additions & 1 deletion python/plugins/processing/algs/gdal/nearblack.py
Expand Up @@ -16,7 +16,6 @@
* *
***************************************************************************
"""
from builtins import str

__author__ = 'Victor Olaya'
__date__ = 'August 2012'
Expand Down
Expand Up @@ -16,7 +16,6 @@
* *
***************************************************************************
"""
from builtins import str

__author__ = 'Victor Olaya'
__date__ = 'November 2012'
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/gdal/rasterize.py
Expand Up @@ -16,7 +16,7 @@
* *
***************************************************************************
"""
from builtins import str


__author__ = 'Alexander Bruy'
__date__ = 'September 2013'
Expand Down
1 change: 0 additions & 1 deletion python/plugins/processing/algs/gdal/rasterize_over.py
Expand Up @@ -16,7 +16,6 @@
* *
***************************************************************************
"""
from builtins import str

__author__ = 'Alexander Bruy'
__date__ = 'September 2013'
Expand Down
2 changes: 0 additions & 2 deletions python/plugins/processing/algs/grass7/Grass7Algorithm.py
Expand Up @@ -16,8 +16,6 @@
* *
***************************************************************************
"""
from builtins import str
from builtins import range

__author__ = 'Victor Olaya'
__date__ = 'February 2015'
Expand Down
Expand Up @@ -16,7 +16,6 @@
* *
***************************************************************************
"""
from builtins import str

__author__ = 'Victor Olaya'
__date__ = 'April 2014'
Expand Down
4 changes: 1 addition & 3 deletions python/plugins/processing/algs/grass7/Grass7Utils.py
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
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
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
Expand Up @@ -16,7 +16,6 @@
* *
***************************************************************************
"""
from builtins import str

__author__ = 'Médéric Ribreux'
__date__ = 'February 2016'
Expand Down
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
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
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
Expand Up @@ -16,7 +16,6 @@
* *
***************************************************************************
"""
from builtins import str

__author__ = 'Médéric Ribreux'
__date__ = 'September 2017'
Expand Down
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
Expand Up @@ -16,7 +16,6 @@
* *
***************************************************************************
"""
from builtins import str

__author__ = 'Médéric Ribreux'
__date__ = 'February 2016'
Expand Down
Expand Up @@ -16,7 +16,6 @@
* *
***************************************************************************
"""
from builtins import range

__author__ = 'Médéric Ribreux'
__date__ = 'December 2015'
Expand Down
1 change: 0 additions & 1 deletion python/plugins/processing/algs/qgis/ConcaveHull.py
Expand Up @@ -16,7 +16,6 @@
* *
***************************************************************************
"""
from builtins import range

__author__ = 'Piotr Pociask'
__date__ = 'May 2014'
Expand Down
1 change: 0 additions & 1 deletion python/plugins/processing/algs/qgis/Datasources2Vrt.py
Expand Up @@ -16,7 +16,6 @@
* *
***************************************************************************
"""
from builtins import range

__author__ = 'Luigi Pirelli'
__date__ = 'May 2015'
Expand Down
1 change: 0 additions & 1 deletion python/plugins/processing/algs/qgis/Delaunay.py
Expand Up @@ -16,7 +16,6 @@
* *
***************************************************************************
"""
from builtins import next

__author__ = 'Victor Olaya'
__date__ = 'August 2012'
Expand Down
1 change: 0 additions & 1 deletion python/plugins/processing/algs/qgis/DensifyGeometries.py
Expand Up @@ -16,7 +16,6 @@
* *
***************************************************************************
"""
from builtins import range

__author__ = 'Victor Olaya'
__date__ = 'October 2012'
Expand Down
Expand Up @@ -17,7 +17,6 @@
* *
***************************************************************************
"""
from builtins import range

__author__ = 'Anita Graser'
__date__ = 'Dec 2012'
Expand Down
1 change: 0 additions & 1 deletion python/plugins/processing/algs/qgis/EliminateSelection.py
Expand Up @@ -16,7 +16,6 @@
* *
***************************************************************************
"""
from builtins import range

__author__ = 'Bernhard Ströbl'
__date__ = 'January 2017'
Expand Down
1 change: 0 additions & 1 deletion python/plugins/processing/algs/qgis/Explode.py
Expand Up @@ -16,7 +16,6 @@
* *
***************************************************************************
"""
from builtins import range

__author__ = 'Victor Olaya'
__date__ = 'August 2012'
Expand Down
1 change: 0 additions & 1 deletion python/plugins/processing/algs/qgis/FieldPyculator.py
Expand Up @@ -16,7 +16,6 @@
* *
***************************************************************************
"""
from builtins import str

__author__ = 'Victor Olaya & NextGIS'
__date__ = 'August 2012'
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/qgis/HubDistanceLines.py
Expand Up @@ -16,7 +16,7 @@
* *
***************************************************************************
"""
from builtins import next


__author__ = 'Michael Minn'
__date__ = 'May 2010'
Expand Down
1 change: 0 additions & 1 deletion python/plugins/processing/algs/qgis/HubDistancePoints.py
Expand Up @@ -16,7 +16,6 @@
* *
***************************************************************************
"""
from builtins import next

__author__ = 'Michael Minn'
__date__ = 'May 2010'
Expand Down
1 change: 0 additions & 1 deletion python/plugins/processing/algs/qgis/HypsometricCurves.py
Expand Up @@ -16,7 +16,6 @@
* *
***************************************************************************
"""
from builtins import str

__author__ = 'Alexander Bruy'
__date__ = 'November 2014'
Expand Down
Expand Up @@ -16,7 +16,6 @@
* *
***************************************************************************
"""
from builtins import str

__author__ = 'Nyall Dawson'
__date__ = 'September 2017'
Expand Down
Expand Up @@ -16,8 +16,6 @@
* *
***************************************************************************
"""
from builtins import next
from builtins import str

__author__ = 'Victor Olaya'
__date__ = 'August 2012'
Expand Down
1 change: 0 additions & 1 deletion python/plugins/processing/algs/qgis/PointsDisplacement.py
Expand Up @@ -16,7 +16,6 @@
* *
***************************************************************************
"""
from builtins import next

__author__ = 'Alexander Bruy'
__date__ = 'July 2013'
Expand Down
2 changes: 0 additions & 2 deletions python/plugins/processing/algs/qgis/PointsFromLines.py
Expand Up @@ -16,8 +16,6 @@
* *
***************************************************************************
"""
from builtins import str
from builtins import range

__author__ = 'Alexander Bruy'
__date__ = 'August 2013'
Expand Down
2 changes: 0 additions & 2 deletions python/plugins/processing/algs/qgis/PointsFromPolygons.py
Expand Up @@ -16,8 +16,6 @@
* *
***************************************************************************
"""
from builtins import str
from builtins import range

__author__ = 'Alexander Bruy'
__date__ = 'August 2013'
Expand Down
1 change: 0 additions & 1 deletion python/plugins/processing/algs/qgis/PointsToPaths.py
Expand Up @@ -16,7 +16,6 @@
* *
***************************************************************************
"""
from builtins import str

__author__ = 'Alexander Bruy'
__date__ = 'April 2014'
Expand Down
1 change: 0 additions & 1 deletion python/plugins/processing/algs/qgis/PostGISExecuteSQL.py
Expand Up @@ -16,7 +16,6 @@
* *
***************************************************************************
"""
from builtins import str

__author__ = 'Victor Olaya, Carterix Geomatics'
__date__ = 'October 2012'
Expand Down
1 change: 0 additions & 1 deletion python/plugins/processing/algs/qgis/RandomExtract.py
Expand Up @@ -16,7 +16,6 @@
* *
***************************************************************************
"""
from builtins import range

__author__ = 'Victor Olaya'
__date__ = 'August 2012'
Expand Down
Expand Up @@ -16,7 +16,6 @@
* *
***************************************************************************
"""
from builtins import range

__author__ = 'Victor Olaya'
__date__ = 'August 2012'
Expand Down

0 comments on commit 0059b2b

Please sign in to comment.