Skip to content

Commit

Permalink
Replace str() with unicode() and some PEP 8
Browse files Browse the repository at this point in the history
  • Loading branch information
m-kuhn committed Aug 16, 2015
1 parent 624f16c commit 9fc1b48
Show file tree
Hide file tree
Showing 198 changed files with 906 additions and 916 deletions.
16 changes: 8 additions & 8 deletions python/plugins/GdalTools/tools/GdalTools_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -508,7 +508,7 @@ def getFilterName(self, aFilter):

@classmethod
def filenameMatchesFilterExt(self, fileName, ext):
return re.match( '.'+str(ext), fileName ) is not None
return re.match( '.'+unicode(ext), fileName ) is not None

# Retrieves gdal information
class GdalConfig:
Expand Down Expand Up @@ -542,7 +542,7 @@ def getSupportedRasters(self):
driver = gdal.GetDriver(i)

if driver is None:
QgsLogger.warning("unable to get driver " + str(i))
QgsLogger.warning("unable to get driver " + unicode(i))
continue

# now we need to see if the driver is for something currently
Expand All @@ -557,7 +557,7 @@ def getSupportedRasters(self):

metadata = driver.GetMetadata()
if gdal.DMD_EXTENSION in metadata:
extensions = str(metadata[gdal.DMD_EXTENSION])
extensions = unicode(metadata[gdal.DMD_EXTENSION])

if longName != '':
if extensions != '':
Expand Down Expand Up @@ -613,7 +613,7 @@ def getSupportedVectors(self):
driver = ogr.GetDriver(i)

if driver is None:
QgsLogger.warning("unable to get driver " + str(i))
QgsLogger.warning("unable to get driver " + unicode(i))
continue

driverName = driver.GetName()
Expand Down Expand Up @@ -802,7 +802,7 @@ def __init__(self, ver):
def string2vers(string):
vers = ['0', '0', '0']

nums = str(string).split(".")
nums = unicode(string).split(".")

if len(nums) > 0:
vers[0] = nums[0]
Expand Down Expand Up @@ -842,10 +842,10 @@ def setProcessEnvironment(process):

envval = os.getenv(name)
if envval is None or envval == "":
envval = str(val)
envval = unicode(val)
elif (platform.system() == "Windows" and val.lower() not in envval.lower().split( sep )) or \
(platform.system() != "Windows" and val not in envval.split( sep )):
envval += "%s%s" % (sep, str(val))
envval += "%s%s" % (sep, unicode(val))
else:
envval = None

Expand All @@ -870,7 +870,7 @@ def setMacOSXDefaultEnvironment():
qgis_standalone_gdal_path = u"%s/Frameworks/GDAL.framework" % qgis_app

# path to the GDAL framework when installed as external framework
gdal_versionsplit = str(GdalConfig.version()).split('.')
gdal_versionsplit = unicode(GdalConfig.version()).split('.')
gdal_base_path = u"/Library/Frameworks/GDAL.framework/Versions/%s.%s" % (gdal_versionsplit[0], gdal_versionsplit[1])

if os.path.exists( qgis_standalone_gdal_path ): # qgis standalone
Expand Down
6 changes: 3 additions & 3 deletions python/plugins/GdalTools/tools/dialogBase.py
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ def onRun(self):
self.enableRun(False)
self.setCursor(Qt.WaitCursor)
if not self.commandIsEditable():
#print(self.command+' '+str(self.arguments))
#print(self.command+' '+unicode(self.arguments))
self.process.start(self.command, self.arguments, QIODevice.ReadOnly)
else:
self.process.start(self.textEditCommand.toPlainText(), QIODevice.ReadOnly)
Expand Down Expand Up @@ -202,9 +202,9 @@ def onFinished(self, exitCode, status):
return

# show the error message if there's one, otherwise show the process output message
msg = str(self.process.readAllStandardError())
msg = unicode(self.process.readAllStandardError())
if msg == '':
outMessages = str(self.process.readAllStandardOutput()).splitlines()
outMessages = unicode(self.process.readAllStandardOutput()).splitlines()

# make sure to not show the help
for m in outMessages:
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/GdalTools/tools/dialogSRS.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ def __init__(self, title, parent=None):
self.connect(buttonBox, SIGNAL("rejected()"), self.reject)

def authid(self):
return str(self.selector.selectedAuthId())
return unicode(self.selector.selectedAuthId())

def proj4string(self):
return self.selector.selectedProj4String()
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/GdalTools/tools/doBuildVRT.py
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ def getArguments(self):
arguments.append("-separate")
if self.srcNoDataCheck.isChecked():
arguments.append("-srcnodata")
arguments.append(str(self.srcNoDataSpin.value()))
arguments.append(unicode(self.srcNoDataSpin.value()))
if self.allowProjDiffCheck.isChecked():
arguments.append("-allow_projection_difference")
arguments.append(self.getOutputFileName())
Expand Down
12 changes: 6 additions & 6 deletions python/plugins/GdalTools/tools/doClipper.py
Original file line number Diff line number Diff line change
Expand Up @@ -137,15 +137,15 @@ def getArgsModeExtent(self):
arguments = []
if self.noDataCheck.isChecked():
arguments.append("-a_nodata")
arguments.append( str(self.noDataSpin.value()))
arguments.append( unicode(self.noDataSpin.value()))
if self.extentModeRadio.isChecked() and self.extentSelector.isCoordsValid():
rect = self.extentSelector.getExtent()
if rect is not None:
arguments.append("-projwin")
arguments.append(str(rect.xMinimum()))
arguments.append(str(rect.yMaximum()))
arguments.append(str(rect.xMaximum()))
arguments.append(str(rect.yMinimum()))
arguments.append(unicode(rect.xMinimum()))
arguments.append(unicode(rect.yMaximum()))
arguments.append(unicode(rect.xMaximum()))
arguments.append(unicode(rect.yMinimum()))
if not self.getOutputFileName() == '':
arguments.append("-of")
arguments.append(self.outputFormat)
Expand All @@ -158,7 +158,7 @@ def getArgsModeMask(self):
arguments = []
if self.noDataCheck.isChecked():
arguments.append("-dstnodata")
arguments.append(str(self.noDataSpin.value()))
arguments.append(unicode(self.noDataSpin.value()))
if self.maskModeRadio.isChecked():
mask = self.maskSelector.filename()
if not mask == '':
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/GdalTools/tools/doContour.py
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ def getArguments(self):
arguments.append(self.attributeEdit.text())
if True: # XXX in this moment the -i argument is not optional
arguments.append("-i")
arguments.append(str(self.intervalDSpinBox.value()))
arguments.append(unicode(self.intervalDSpinBox.value()))
arguments.append(self.getInputFileName())
arguments.append(self.outSelector.filename())
return arguments
Expand Down
4 changes: 2 additions & 2 deletions python/plugins/GdalTools/tools/doFillNodata.py
Original file line number Diff line number Diff line change
Expand Up @@ -152,10 +152,10 @@ def getArguments(self):
arguments.append( self.distanceSpin.text())
if self.smoothCheck.isChecked() and self.smoothSpin.value() != 0:
arguments.append( "-si")
arguments.append( str( self.smoothSpin.value() ))
arguments.append( unicode( self.smoothSpin.value() ))
if self.bandCheck.isChecked() and self.bandSpin.value() != 0:
arguments.append( "-b")
arguments.append( str( self.bandSpin.value() ))
arguments.append( unicode( self.bandSpin.value() ))
if self.maskCheck.isChecked() and maskFile:
arguments.append( "-mask")
arguments.append( maskFile)
Expand Down
56 changes: 28 additions & 28 deletions python/plugins/GdalTools/tools/doGrid.py
Original file line number Diff line number Diff line change
Expand Up @@ -130,18 +130,18 @@ def getArguments(self):
rect = self.extentSelector.getExtent()
if rect is not None:
arguments.append( "-txe")
arguments.append( str(rect.xMinimum()))
arguments.append( str(rect.xMaximum()))
arguments.append( unicode(rect.xMinimum()))
arguments.append( unicode(rect.xMaximum()))
arguments.append( "-tye")
arguments.append( str(rect.yMaximum()))
arguments.append( str(rect.yMinimum()))
arguments.append( unicode(rect.yMaximum()))
arguments.append( unicode(rect.yMinimum()))
if self.algorithmCheck.isChecked() and self.algorithmCombo.currentIndex() >= 0:
arguments.append( "-a")
arguments.append( self.algorithmArguments(self.algorithmCombo.currentIndex()))
if self.resizeGroupBox.isChecked():
arguments.append( "-outsize")
arguments.append( str( self.widthSpin.value() ))
arguments.append( str( self.heightSpin.value() ))
arguments.append( unicode( self.widthSpin.value() ))
arguments.append( unicode( self.heightSpin.value() ))
outputFn = self.getOutputFileName()
if outputFn:
arguments.append( "-of")
Expand All @@ -164,34 +164,34 @@ def algorithmArguments(self, index):
arguments = []
if algorithm == "invdist":
arguments.append(algorithm)
arguments.append("power=" + str(self.invdistPowerSpin.value()))
arguments.append("smothing=" + str(self.invdistSmothingSpin.value()))
arguments.append("radius1=" + str(self.invdistRadius1Spin.value()))
arguments.append("radius2=" + str(self.invdistRadius2Spin.value()))
arguments.append("angle=" + str(self.invdistAngleSpin.value()))
arguments.append("max_points=" + str(self.invdistMaxPointsSpin.value()))
arguments.append("min_points=" + str(self.invdistMinPointsSpin.value()))
arguments.append("nodata=" + str(self.invdistNoDataSpin.value()))
arguments.append("power=" + unicode(self.invdistPowerSpin.value()))
arguments.append("smothing=" + unicode(self.invdistSmothingSpin.value()))
arguments.append("radius1=" + unicode(self.invdistRadius1Spin.value()))
arguments.append("radius2=" + unicode(self.invdistRadius2Spin.value()))
arguments.append("angle=" + unicode(self.invdistAngleSpin.value()))
arguments.append("max_points=" + unicode(self.invdistMaxPointsSpin.value()))
arguments.append("min_points=" + unicode(self.invdistMinPointsSpin.value()))
arguments.append("nodata=" + unicode(self.invdistNoDataSpin.value()))
elif algorithm == "average":
arguments.append(algorithm)
arguments.append("radius1=" + str(self.averageRadius1Spin.value()))
arguments.append("radius2=" + str(self.averageRadius2Spin.value()))
arguments.append("angle=" + str(self.averageAngleSpin.value()))
arguments.append("min_points=" + str(self.averageMinPointsSpin.value()))
arguments.append("nodata=" + str(self.averageNoDataSpin.value()))
arguments.append("radius1=" + unicode(self.averageRadius1Spin.value()))
arguments.append("radius2=" + unicode(self.averageRadius2Spin.value()))
arguments.append("angle=" + unicode(self.averageAngleSpin.value()))
arguments.append("min_points=" + unicode(self.averageMinPointsSpin.value()))
arguments.append("nodata=" + unicode(self.averageNoDataSpin.value()))
elif algorithm == "nearest":
arguments.append(algorithm)
arguments.append("radius1=" + str(self.nearestRadius1Spin.value()))
arguments.append("radius2=" + str(self.nearestRadius2Spin.value()))
arguments.append("angle=" + str(self.nearestAngleSpin.value()))
arguments.append("nodata=" + str(self.nearestNoDataSpin.value()))
arguments.append("radius1=" + unicode(self.nearestRadius1Spin.value()))
arguments.append("radius2=" + unicode(self.nearestRadius2Spin.value()))
arguments.append("angle=" + unicode(self.nearestAngleSpin.value()))
arguments.append("nodata=" + unicode(self.nearestNoDataSpin.value()))
else:
arguments.append(self.datametrics[self.datametricsCombo.currentIndex()])
arguments.append("radius1=" + str(self.datametricsRadius1Spin.value()))
arguments.append("radius2=" + str(self.datametricsRadius2Spin.value()))
arguments.append("angle=" + str(self.datametricsAngleSpin.value()))
arguments.append("min_points=" + str(self.datametricsMinPointsSpin.value()))
arguments.append("nodata=" + str(self.datametricsNoDataSpin.value()))
arguments.append("radius1=" + unicode(self.datametricsRadius1Spin.value()))
arguments.append("radius2=" + unicode(self.datametricsRadius2Spin.value()))
arguments.append("angle=" + unicode(self.datametricsAngleSpin.value()))
arguments.append("min_points=" + unicode(self.datametricsMinPointsSpin.value()))
arguments.append("nodata=" + unicode(self.datametricsNoDataSpin.value()))
return ':'.join(arguments)

def loadFields(self, vectorFile=''):
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/GdalTools/tools/doInfo.py
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ def onLayersChanged(self):

def finished( self ):
self.rasterInfoList.clear()
arr = str(self.base.process.readAllStandardOutput()).strip()
arr = unicode(self.base.process.readAllStandardOutput()).strip()
if platform.system() == "Windows":
#info = QString.fromLocal8Bit( arr ).strip().split( "\r\n" )
# TODO test
Expand Down