gdaltools: cleanup

brushtyler · brushtyler · commit dd406dce3ee4 · 2013-06-27T22:52:46.000+02:00
diff --git a/python/plugins/GdalTools/tools/dialogBase.py b/python/plugins/GdalTools/tools/dialogBase.py
@@ -207,7 +207,7 @@ def onFinished(self, exitCode, status):
       # show the error message if there's one, otherwise show the process output message
       msg = str(self.process.readAllStandardError())
       if msg == '':
-        outMessages = string.split( str(self.process.readAllStandardOutput()), sep="\n" )
+        outMessages = str(self.process.readAllStandardOutput()).splitlines()
 
         # make sure to not show the help
         for m in outMessages:
@@ -222,7 +222,7 @@ def onFinished(self, exitCode, status):
           #if m.contains( QRegExp( "0(?:\\.+[1-9]0{1,2})+" ) ):
           #  continue
 
-          if not msg == '':
+          if msg:
             msg += "\n"
           msg += m
 
diff --git a/python/plugins/GdalTools/tools/doContour.py b/python/plugins/GdalTools/tools/doContour.py
@@ -108,8 +108,8 @@ def getInputFileName(self):
 
   def getOutputFileName(self):
       if self.useDirAsOutput:
-        fn = self.outSelector.filename()
-        return fn if not fn else fn + QDir.separator() + "contour.shp"
+        if self.outSelector.filename():
+          return self.outSelector.filename() + QDir.separator() + "contour.shp"
       return self.outSelector.filename()
 
   def addLayerIntoCanvas(self, fileInfo):
diff --git a/python/plugins/GdalTools/tools/doInfo.py b/python/plugins/GdalTools/tools/doInfo.py
@@ -103,9 +103,9 @@ def finished( self ):
       if platform.system() == "Windows":
         #info = QString.fromLocal8Bit( arr ).strip().split( "\r\n" )
         # TODO test
-        info = string.split(arr, sep="\r\n" )
+        info = arr.splitlines()
       else:
-        info = string.split(arr, sep="\n" )
+        info = arr.splitlines()
       self.rasterInfoList.addItems( info )
 
   def fillInputFileEdit( self ):
