diff --git a/python/plugins/fTools/tools/doGeoprocessing.py b/python/plugins/fTools/tools/doGeoprocessing.py
index a2a10e3029e..e250a83279d 100644
--- a/python/plugins/fTools/tools/doGeoprocessing.py
+++ b/python/plugins/fTools/tools/doGeoprocessing.py
@@ -892,7 +892,7 @@ class geoprocessingThread( QThread ):
crs_match = crsA == crsB
fields = ftools_utils.combineVectorFields( self.vlayerA, self.vlayerB )
longNames = ftools_utils.checkFieldNameLength( fields )
- if not longNames.isEmpty():
+ if longNames:
message = self.tr('Following field names are longer than 10 characters:\n%s') % ( '\n'.join(longNames) )
return GEOS_EXCEPT, FEATURE_EXCEPT, crs_match, message
@@ -1077,7 +1077,7 @@ class geoprocessingThread( QThread ):
fields = ftools_utils.combineVectorFields( self.vlayerA, self.vlayerB )
longNames = ftools_utils.checkFieldNameLength( fields )
- if not longNames.isEmpty():
+ if longNames:
message = self.tr( 'Following field names are longer than 10 characters:\n%s' ) % ( "\n".join(longNames) )
return GEOS_EXCEPT, FEATURE_EXCEPT, crs_match, message
@@ -1263,7 +1263,7 @@ class geoprocessingThread( QThread ):
fields = ftools_utils.combineVectorFields( self.vlayerA, self.vlayerB )
longNames = ftools_utils.checkFieldNameLength( fields )
- if not longNames.isEmpty():
+ if longNames:
message = self.tr( 'Following field names are longer than 10 characters:\n%s' ) % ( "\n".join(longNames) )
return GEOS_EXCEPT, FEATURE_EXCEPT, crs_match, message
diff --git a/python/plugins/fTools/tools/doMergeShapes.py b/python/plugins/fTools/tools/doMergeShapes.py
index 3ee9ac1e0e8..d9332201e3f 100644
--- a/python/plugins/fTools/tools/doMergeShapes.py
+++ b/python/plugins/fTools/tools/doMergeShapes.py
@@ -53,7 +53,7 @@ class Dialog( QDialog, Ui_Dialog ):
self.tr( "Select directory with shapefiles to merge" ),
lastDir )
- if inDir.isEmpty():
+ if not inDir:
return
workDir = QDir( inDir )
@@ -89,8 +89,8 @@ class Dialog( QDialog, Ui_Dialog ):
fileName = QFileInfo( f ).fileName()
self.inputFiles.append( fileName )
- self.progressFiles.setRange( 0, self.inputFiles.count() )
- self.leInputDir.setText( files.join( ";" ) )
+ self.progressFiles.setRange( 0, len( self.inputFiles ) )
+ self.leInputDir.setText( ";".join( files ) )
def changeMode( self ):
if self.chkListMode.isChecked():
diff --git a/python/plugins/fTools/tools/doPointDistance.py b/python/plugins/fTools/tools/doPointDistance.py
index 3cb52335813..e1f47cd7064 100644
--- a/python/plugins/fTools/tools/doPointDistance.py
+++ b/python/plugins/fTools/tools/doPointDistance.py
@@ -143,7 +143,7 @@ class Dialog(QDialog, Ui_Dialog):
fileCheck = QFile(outName)
filePath = QFileInfo(outName).absoluteFilePath()
if filePath.right(4) != ".csv": filePath = filePath + ".csv"
- if not outName.isEmpty():
+ if outName:
self.outFile.insert(filePath)
def compute(self, line1, line2, field1, field2, outPath, matType, nearest, progressBar):
diff --git a/python/plugins/fTools/tools/doSpatialIndex.py b/python/plugins/fTools/tools/doSpatialIndex.py
index ec24587abb7..870428c5cdb 100644
--- a/python/plugins/fTools/tools/doSpatialIndex.py
+++ b/python/plugins/fTools/tools/doSpatialIndex.py
@@ -133,7 +133,7 @@ class Dialog( QDialog, Ui_Dialog ):
self.stopProcessing()
self.restoreGui()
- if not errors.isEmpty():
+ if errors:
msg = self.tr( "Processing of the following layers/files ended with error:
" ) + "
".join(errors)
QErrorMessage( self ).showMessage( msg )
diff --git a/python/plugins/fTools/tools/doValidate.py b/python/plugins/fTools/tools/doValidate.py
index bcec4a7714e..bdbacf8c874 100644
--- a/python/plugins/fTools/tools/doValidate.py
+++ b/python/plugins/fTools/tools/doValidate.py
@@ -115,7 +115,7 @@ class ValidateDialog( QDialog, Ui_Dialog ):
for row in range( self.tblUnique.rowCount() ):
items.append( self.tblUnique.item( row, 0 ).text()
+ "," + self.tblUnique.item( row, 1 ).text() + "\n" )
- if not items.isEmpty():
+ if items:
clip_board = QApplication.clipboard()
clip_board.setText( items )
else:
diff --git a/python/plugins/fTools/tools/doVectorSplit.py b/python/plugins/fTools/tools/doVectorSplit.py
index 298aca856d5..9cdf0a23e9f 100644
--- a/python/plugins/fTools/tools/doVectorSplit.py
+++ b/python/plugins/fTools/tools/doVectorSplit.py
@@ -123,7 +123,7 @@ class Dialog(QDialog, Ui_Dialog):
outPath = self.outShape.text()
self.restoreGui()
- if not errors.isEmpty():
+ if errors:
msg = self.tr( "Processing of the following layers/files ended with error:
" ) + "
".join(errors)
QErrorMessage( self ).showMessage( msg )
diff --git a/python/plugins/fTools/tools/doVisual.py b/python/plugins/fTools/tools/doVisual.py
index 57cfccecf26..23aa337c185 100644
--- a/python/plugins/fTools/tools/doVisual.py
+++ b/python/plugins/fTools/tools/doVisual.py
@@ -72,7 +72,7 @@ class VisualDialog( QDialog, Ui_Dialog ):
else:
for rec in range( self.tblUnique.rowCount() ):
items.append( self.tblUnique.item( rec, 0 ).text() + ":" + self.tblUnique.item( rec, 1 ).text() + "\n" )
- if not items.isEmpty():
+ if items:
clip_board = QApplication.clipboard()
clip_board.setText( items )
else: