update to latest changes in master

qgis · Feb 2, 2015 · e3bd6acbacb2c664ba15bdac8a2a0fc4daca8f32 · e3bd6ac
1 parent dab3092
commit e3bd6acbacb2c664ba15bdac8a2a0fc4daca8f32
Showing with 3 additions and 14 deletions.

+1 −8 python/plugins/processing/algs/gdal/ogr2ogrtopostgis.py

+2 −6 python/plugins/processing/algs/gdal/ogr2ogrtopostgislist.py
diff --git a/python/plugins/processing/algs/gdal/ogr2ogrtopostgis.py b/python/plugins/processing/algs/gdal/ogr2ogrtopostgis.py
@@ -25,13 +25,6 @@
 
 __revision__ = '$Format:%H$'
 
-import os
-
-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
-
-from qgis.core import *
-
 from processing.core.parameters import ParameterVector
 from processing.core.parameters import ParameterString
 from processing.core.parameters import ParameterCrs
@@ -40,7 +33,7 @@
 from processing.core.parameters import ParameterExtent
 from processing.core.parameters import ParameterTableField
 
-from processing.tools.system import *
+from processing.tools.system import isWindows
 
 from processing.algs.gdal.OgrAlgorithm import OgrAlgorithm
 from processing.algs.gdal.GdalUtils import GdalUtils

diff --git a/python/plugins/processing/algs/gdal/ogr2ogrtopostgislist.py b/python/plugins/processing/algs/gdal/ogr2ogrtopostgislist.py
@@ -25,12 +25,8 @@
 
 __revision__ = '$Format:%H$'
 
-import os
 
-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
-
-from qgis.core import *
+from PyQt4.QtCore import QSettings
 
 from processing.core.parameters import ParameterVector
 from processing.core.parameters import ParameterString
@@ -40,7 +36,7 @@
 from processing.core.parameters import ParameterExtent
 from processing.core.parameters import ParameterTableField
 
-from processing.tools.system import *
+from processing.tools.system import isWindows
 
 from processing.algs.gdal.OgrAlgorithm import OgrAlgorithm
 from processing.algs.gdal.GdalUtils import GdalUtils