Skip to content
Permalink
Browse files

python fixes:

* issues identified by pyflakes (star and unused imports)
* pyqtwrapper: add QtSvg
* some exceptions e.message => unicode(e)
* some translations tr("..." % foo) => tr("...") % foo
* TODO:
  python/console/console_sci.py:547 QsciScintillaCompat?
  python/plugins/db_manager/dlg_query_builder.py:304 pop_up_error?
  • Loading branch information
jef-n committed Mar 15, 2016
1 parent cc5219b commit c6d921729e2c1fa6f2290c89da52c108c800e416
Showing with 269 additions and 447 deletions.
  1. +1 −0 python/PyQt/CMakeLists.txt
  2. +2 −8 python/PyQt/PyQt4/QtCore.py
  3. +26 −0 python/PyQt/PyQt4/QtSvg.py
  4. +1 −0 python/PyQt/PyQt5/QtSvg.py
  5. +2 −7 python/__init__.py
  6. +1 −1 python/console/console_compile_apis.py
  7. +1 −1 python/console/console_editor.py
  8. +1 −1 python/console/console_sci.py
  9. +0 −3 python/plugins/GdalTools/GdalTools.py
  10. +0 −5 python/plugins/db_manager/db_manager_plugin.py
  11. +1 −6 python/plugins/db_manager/db_model.py
  12. +1 −4 python/plugins/db_manager/db_plugins/oracle/connector.py
  13. +2 −4 python/plugins/db_manager/db_plugins/oracle/data_model.py
  14. +2 −3 python/plugins/db_manager/db_plugins/oracle/info_model.py
  15. +5 −10 python/plugins/db_manager/db_plugins/oracle/plugin.py
  16. +1 −1 python/plugins/db_manager/db_plugins/plugin.py
  17. +0 −5 python/plugins/db_manager/db_plugins/postgis/plugin.py
  18. +1 −1 python/plugins/db_manager/db_plugins/spatialite/info_model.py
  19. +0 −5 python/plugins/db_manager/db_plugins/spatialite/plugin.py
  20. +6 −25 python/plugins/db_manager/db_plugins/vlayers/connector.py
  21. +1 −3 python/plugins/db_manager/db_plugins/vlayers/data_model.py
  22. +3 −8 python/plugins/db_manager/db_plugins/vlayers/plugin.py
  23. +1 −1 python/plugins/db_manager/db_tree.py
  24. +3 −3 python/plugins/db_manager/dlg_query_builder.py
  25. +2 −2 python/plugins/db_manager/dlg_sql_window.py
  26. +1 −1 python/plugins/processing/algs/gdal/GdalAlgorithmDialog.py
  27. +0 −4 python/plugins/processing/algs/gdal/GdalOgrAlgorithmProvider.py
  28. +0 −2 python/plugins/processing/algs/gdal/OgrAlgorithm.py
  29. +0 −5 python/plugins/processing/algs/gdal/aspect.py
  30. +0 −5 python/plugins/processing/algs/gdal/fillnodata.py
  31. +0 −4 python/plugins/processing/algs/gdal/gdalcalc.py
  32. +0 −5 python/plugins/processing/algs/gdal/hillshade.py
  33. +0 −1 python/plugins/processing/algs/gdal/ogr2ogrbuffer.py
  34. +0 −1 python/plugins/processing/algs/gdal/ogr2ogrdissolve.py
  35. +0 −1 python/plugins/processing/algs/gdal/ogr2ogronesidebuffer.py
  36. +0 −1 python/plugins/processing/algs/gdal/ogr2ogrpointsonlines.py
  37. +0 −3 python/plugins/processing/algs/gdal/ogr2ogrtabletopostgislist.py
  38. +0 −2 python/plugins/processing/algs/gdal/rasterize_over.py
  39. +0 −5 python/plugins/processing/algs/gdal/roughness.py
  40. +0 −5 python/plugins/processing/algs/gdal/slope.py
  41. +0 −5 python/plugins/processing/algs/gdal/tpi.py
  42. +0 −5 python/plugins/processing/algs/gdal/tri.py
  43. +1 −1 python/plugins/processing/algs/grass7/Grass7AlgorithmProvider.py
  44. +0 −2 python/plugins/processing/algs/grass7/ext/r_null.py
  45. +0 −1 python/plugins/processing/algs/grass7/ext/v_net.py
  46. +1 −1 python/plugins/processing/algs/help/__init__.py
  47. +0 −1 python/plugins/processing/algs/lidar/fusion/CanopyModel.py
  48. +1 −2 python/plugins/processing/algs/otb/OTBAlgorithm.py
  49. +3 −3 python/plugins/processing/algs/otb/OTBAlgorithmProvider.py
  50. +2 −4 python/plugins/processing/algs/otb/maintenance/OTBHelper.py
  51. +1 −3 python/plugins/processing/algs/otb/maintenance/OTBSpecific_XMLcreation.py
  52. +7 −7 python/plugins/processing/algs/otb/maintenance/OTBTester.py
  53. +3 −7 python/plugins/processing/algs/qgis/ExecuteSQL.py
  54. +3 −3 python/plugins/processing/algs/qgis/FieldPyculator.py
  55. +1 −1 python/plugins/processing/algs/qgis/ImportIntoPostGIS.py
  56. +2 −2 python/plugins/processing/algs/qgis/PostGISExecuteSQL.py
  57. +3 −3 python/plugins/processing/algs/qgis/postgis_utils.py
  58. +3 −3 python/plugins/processing/algs/qgis/spatialite_utils.py
  59. +1 −3 python/plugins/processing/algs/saga/SagaAlgorithm212.py
  60. +1 −1 python/plugins/processing/algs/saga/SagaAlgorithm213.py
  61. +1 −1 python/plugins/processing/algs/saga/SplitRGBBands.py
  62. +0 −1 python/plugins/processing/core/GeoAlgorithm.py
  63. +1 −3 python/plugins/processing/core/Processing.py
  64. +2 −2 python/plugins/processing/core/ProcessingLog.py
  65. +0 −2 python/plugins/processing/core/parameters.py
  66. +1 −1 python/plugins/processing/gui/AlgorithmDialog.py
  67. +2 −2 python/plugins/processing/gui/AlgorithmDialogBase.py
  68. +0 −10 python/plugins/processing/gui/BatchAlgorithmDialog.py
  69. +1 −1 python/plugins/processing/gui/BatchPanel.py
  70. +1 −1 python/plugins/processing/gui/ConfigDialog.py
  71. +1 −1 python/plugins/processing/gui/HelpEditionDialog.py
  72. +0 −2 python/plugins/processing/gui/MessageBarProgress.py
  73. +0 −1 python/plugins/processing/gui/MessageDialog.py
  74. +1 −1 python/plugins/processing/gui/OutputSelectionPanel.py
  75. +1 −1 python/plugins/processing/gui/ParametersPanel.py
  76. +0 −2 python/plugins/processing/gui/PointSelectionPanel.py
  77. +1 −1 python/plugins/processing/gui/PostgisTableSelector.py
  78. +0 −1 python/plugins/processing/gui/Postprocessing.py
  79. +1 −2 python/plugins/processing/gui/ProcessingToolbox.py
  80. +1 −1 python/plugins/processing/gui/TestTools.py
  81. +2 −3 python/plugins/processing/modeler/ModelerAlgorithm.py
  82. +0 −1 python/plugins/processing/modeler/ModelerDialog.py
  83. +2 −5 python/plugins/processing/tests/AlgorithmsTestBase.py
  84. +1 −0 python/plugins/processing/tools/raster.py
  85. +1 −1 python/plugins/processing/tools/system.py
  86. +1 −2 python/plugins/processing/tools/vector.py
  87. +0 −1 python/pyplugin_installer/__init__.py
  88. +7 −0 scripts/qgis_fixes/fix_pyqt.py
  89. +1 −1 tests/src/python/providertestbase.py
  90. +1 −2 tests/src/python/qgis_interface.py
  91. +1 −1 tests/src/python/qgscompositionchecker.py
  92. +0 −5 tests/src/python/test_provider_memory.py
  93. +2 −5 tests/src/python/test_provider_mssql.py
  94. +3 −2 tests/src/python/test_provider_postgres.py
  95. +3 −2 tests/src/python/test_provider_shapefile.py
  96. +2 −1 tests/src/python/test_provider_spatialite.py
  97. +2 −5 tests/src/python/test_provider_tabfile.py
  98. +2 −7 tests/src/python/test_provider_virtual.py
  99. +2 −2 tests/src/python/test_qgsanalysis.py
  100. +1 −1 tests/src/python/test_qgsapplication.py
  101. +1 −1 tests/src/python/test_qgsatlascomposition.py
  102. +2 −2 tests/src/python/test_qgsattributetablemodel.py
  103. +4 −5 tests/src/python/test_qgsauthsystem.py
  104. +2 −1 tests/src/python/test_qgsblendmodes.py
  105. +2 −12 tests/src/python/test_qgscategorizedsymbolrendererv2.py
  106. +2 −1 tests/src/python/test_qgscolorscheme.py
  107. +2 −1 tests/src/python/test_qgscolorschemeregistry.py
  108. +2 −1 tests/src/python/test_qgscomposereffects.py
  109. +2 −1 tests/src/python/test_qgscomposerhtml.py
  110. +2 −1 tests/src/python/test_qgscomposerlabel.py
  111. +2 −1 tests/src/python/test_qgscomposermap.py
  112. +1 −1 tests/src/python/test_qgscomposermapgrid.py
  113. +3 −4 tests/src/python/test_qgscomposerpicture.py
  114. +1 −1 tests/src/python/test_qgscomposershapes.py
  115. +2 −2 tests/src/python/test_qgscomposition.py
  116. +1 −3 tests/src/python/test_qgsconditionalstyle.py
  117. +1 −1 tests/src/python/test_qgscoordinatetransform.py
  118. +2 −5 tests/src/python/test_qgsdelimitedtextprovider.py
  119. +1 −1 tests/src/python/test_qgsdistancearea.py
  120. +1 −6 tests/src/python/test_qgseditwidgets.py
  121. +2 −1 tests/src/python/test_qgsexpression.py
  122. +2 −2 tests/src/python/test_qgsfeature.py
  123. +3 −4 tests/src/python/test_qgsfeatureiterator.py
  124. +2 −4 tests/src/python/test_qgsfield.py
  125. +1 −1 tests/src/python/test_qgsgeometry.py
  126. +1 −1 tests/src/python/test_qgsgeometry_avoid_intersections.py
  127. +3 −2 tests/src/python/test_qgsgeometrygeneratorsymbollayerv2.py
  128. +1 −1 tests/src/python/test_qgsgraduatedsymbolrendererv2.py
  129. +2 −1 tests/src/python/test_qgsissue7244.py
  130. +2 −4 tests/src/python/test_qgslayerdefinition.py
  131. +3 −2 tests/src/python/test_qgslogger.py
  132. +2 −2 tests/src/python/test_qgsmapunitscale.py
  133. +2 −2 tests/src/python/test_qgsnetworkcontentfetcher.py
  134. +2 −1 tests/src/python/test_qgspallabeling_base.py
  135. +2 −1 tests/src/python/test_qgspallabeling_canvas.py
  136. +2 −1 tests/src/python/test_qgspallabeling_composer.py
  137. +3 −4 tests/src/python/test_qgspallabeling_placement.py
  138. +2 −1 tests/src/python/test_qgspallabeling_server.py
  139. +2 −1 tests/src/python/test_qgspallabeling_tests.py
  140. +1 −1 tests/src/python/test_qgspoint.py
  141. +1 −1 tests/src/python/test_qgsproject.py
  142. +2 −5 tests/src/python/test_qgsrangewidgets.py
  143. +2 −1 tests/src/python/test_qgsrasterfilewriter.py
  144. +3 −2 tests/src/python/test_qgsrasterlayer.py
  145. +1 −1 tests/src/python/test_qgsrectangle.py
  146. +1 −1 tests/src/python/test_qgsrelation.py
  147. +5 −11 tests/src/python/test_qgsrelationeditwidget.py
  148. +2 −1 tests/src/python/test_qgsrulebasedrenderer.py
  149. +4 −3 tests/src/python/test_qgsserver_accesscontrol.py
  150. +2 −6 tests/src/python/test_qgssinglesymbolrenderer.py
  151. +1 −1 tests/src/python/test_qgsspatialindex.py
  152. +2 −7 tests/src/python/test_qgssymbolexpressionvariables.py
  153. +2 −1 tests/src/python/test_qgssymbollayerv2.py
  154. +2 −4 tests/src/python/test_qgssymbolv2.py
  155. +1 −1 tests/src/python/test_qgsunittypes.py
  156. +3 −3 tests/src/python/test_qgsvectorcolorramp.py
  157. +1 −1 tests/src/python/test_qgsvectorfilewriter.py
  158. +3 −2 tests/src/python/test_qgsvectorlayer.py
  159. +3 −4 tests/src/python/test_qgsvirtuallayerdefinition.py
  160. +1 −2 tests/src/python/test_qgszonalstatistics.py
  161. +1 −2 tests/src/python/test_syntactic_sugar.py
  162. +3 −5 tests/src/python/utilities.py
@@ -13,6 +13,7 @@ SET(PYQT_COMPAT_FILES
QtXml.py
QtSql.py
QtTest.py
QtSvg.py
Qsci.py
uic/__init__.py
uic/pyuic.py
@@ -24,14 +24,8 @@
__revision__ = '$Format:%H$'

import sip

try:
apis = ["QDate", "QDateTime", "QString", "QTextStream", "QTime", "QUrl", "QVariant"]
for api in apis:
sip.setapi(api, 2)
except ValueError:
# API has already been set so we can't set it again.
pass
for api in ["QDate", "QDateTime", "QString", "QTextStream", "QTime", "QUrl", "QVariant"]:
sip.setapi(api, 2)

from PyQt4.QtCore import *
from PyQt4.QtGui import QItemSelectionModel, QSortFilterProxyModel
@@ -0,0 +1,26 @@
# -*- coding: utf-8 -*-

"""
***************************************************************************
QtSvg.py
---------------------
Date : March 2016
Copyright : (C) 2016 by Jürgen E. Fischer
Email : jef at norbit dot de
***************************************************************************
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
* *
***************************************************************************
"""

__author__ = 'Jürgen E. Fischer'
__date__ = 'March 2016'
__copyright__ = '(C) 2016, Jürgen E. Fischer'
# This will get replaced with a git SHA1 when you do a git archive
__revision__ = '$Format:%H$'

from PyQt4.QtSvg import *
@@ -0,0 +1 @@
from PyQt5.QtSvg import *
@@ -25,13 +25,8 @@

import sip

try:
apis = ["QDate", "QDateTime", "QString", "QTextStream", "QTime", "QUrl", "QVariant"]
for api in apis:
sip.setapi(api, 2)
except ValueError:
# API has already been set so we can't set it again.
pass
for api in ["QDate", "QDateTime", "QString", "QTextStream", "QTime", "QUrl", "QVariant"]:
sip.setapi(api, 2)

from qgis.core import QgsFeature, QgsGeometry

@@ -21,7 +21,7 @@

import os

from PyQt4.Qsci import QsciAPIs, QsciLexerPython
from PyQt4.Qsci import QsciAPIs
from PyQt4.QtGui import QDialog, QDialogButtonBox
from PyQt4.QtCore import QCoreApplication

@@ -19,7 +19,7 @@
Some portions of code were taken from https://code.google.com/p/pydee/
"""

from PyQt4.QtCore import Qt, QObject, QEvent, QSettings, QCoreApplication, QFileInfo, QSize, QDir, SIGNAL
from PyQt4.QtCore import Qt, QObject, QEvent, QSettings, QCoreApplication, QFileInfo, QSize, SIGNAL
from PyQt4.QtGui import QFont, QFontMetrics, QColor, QShortcut, QKeySequence, QMenu, QApplication, QCursor, QWidget, QGridLayout, QSpacerItem, QSizePolicy, QFileDialog, QTabWidget, QTreeWidgetItem, QFrame, QLabel, QToolButton, QMessageBox
from PyQt4.Qsci import (QsciScintilla,
QsciLexerPython,
@@ -544,7 +544,7 @@ def dropEvent(self, e):
e.setDropAction(Qt.CopyAction)
e.accept()
else:
QsciScintillaCompat.dropEvent(self, e)
QsciScintillaCompat.dropEvent(self, e) # FIXME

def insertFromDropPaste(self, textDP):
pasteList = unicode(textDP).splitlines()
@@ -23,9 +23,6 @@
from qgis.core import QGis
import qgis.utils

# load icons for actions
import resources_rc

# are all dependencies satisfied?
valid = True

@@ -23,11 +23,6 @@
from PyQt4.QtCore import Qt, QObject, SIGNAL
from PyQt4.QtGui import QAction, QIcon, QApplication

try:
from . import resources_rc
except ImportError:
pass


class DBManagerPlugin:

@@ -21,7 +21,7 @@
"""

from PyQt4.QtCore import Qt, QObject, SIGNAL, qDebug, QByteArray, QMimeData, QDataStream, QIODevice, QFileInfo, \
QAbstractItemModel, QModelIndex, QSettings
QAbstractItemModel, QModelIndex
from PyQt4.QtGui import QApplication, QIcon, QMessageBox

from .db_plugins import supportedDbTypes, createDbPlugin
@@ -30,11 +30,6 @@

import qgis.core

try:
from . import resources_rc
except ImportError:
pass


class TreeItem(QObject):

@@ -23,6 +23,7 @@
***************************************************************************/
"""

from PyQt4.QtCore import QPyNullVariant
from PyQt4.QtSql import QSqlDatabase

from ..connector import DBConnector
@@ -238,8 +239,6 @@ def getRawTablePrivileges(self, table, owner, grantee):
user.
"""
result = [False, False, False, False]
if owner != self.user:
prefix = u"USER"
# Inspect in all tab privs
sql = u"""
SELECT DISTINCT PRIVILEGE
@@ -338,7 +337,6 @@ def getTables(self, schema=None, add_sys_tables=False):
# get all non geographic tables and views
prefix = u"ALL"
owner = u"o.owner"
metatable = u"tab_columns"
where = u""
if self.userTablesOnly:
prefix = u"USER"
@@ -1752,5 +1750,4 @@ def getSqlDictionary(self):

def getQueryBuilderDictionary(self):
from .sql_dictionary import getQueryBuilderDictionary

return getQueryBuilderDictionary()
@@ -23,12 +23,10 @@
***************************************************************************/
"""

from PyQt4.QtCore import QTime
from PyQt4.QtCore import QTime, SIGNAL

from ..data_model import TableDataModel, SqlResultModel, \
BaseTableModel, TableFieldsModel, SimpleTableModel
from ..data_model import TableDataModel, SqlResultModel, BaseTableModel
from ..plugin import DbError
from qgis.core import *


class ORTableDataModel(TableDataModel):
@@ -26,10 +26,9 @@
from PyQt4.QtGui import QApplication
from qgis.core import QGis

from ..info_model import TableInfo, VectorTableInfo, DatabaseInfo, \
SchemaInfo
from ..info_model import TableInfo, VectorTableInfo, DatabaseInfo
from ..html_elems import HtmlContent, HtmlSection, HtmlParagraph, \
HtmlList, HtmlTable, HtmlTableHeader, HtmlTableCol
HtmlTable, HtmlTableHeader, HtmlTableCol

# Syntax Highlight for VIEWS/MVIEWS
from pygments import highlight
@@ -26,19 +26,15 @@
# this will disable the dbplugin if the connector raise an ImportError
from .connector import OracleDBConnector

from PyQt4.QtCore import QSettings
from PyQt4.QtGui import QIcon, QAction, QApplication, QMessageBox
from PyQt4.QtCore import Qt, QSettings, QPyNullVariant
from PyQt4.QtGui import QIcon, QAction, QApplication, QMessageBox, QKeySequence

from qgis.core import QgsVectorLayer

from ..plugin import ConnectionError, InvalidDataException, DBPlugin, \
Database, Schema, Table, VectorTable, TableField, TableConstraint, \
TableIndex, TableTrigger, TableRule

try:
from . import resources_rc
except ImportError:
pass
TableIndex, TableTrigger

from ..html_elems import HtmlParagraph, HtmlList, HtmlTable

from qgis.core import QgsCredentials

@@ -198,7 +194,6 @@ def sqlResultModel(self, sql, parent):
def toSqlLayer(self, sql, geomCol, uniqueCol,
layerName=u"QueryLayer", layerType=None,
avoidSelectById=False, filter=""):
from qgis.core import QgsMapLayer, QgsVectorLayer

uri = self.uri()
con = self.database().connector
@@ -289,7 +289,7 @@ def registerAllActions(self, mainWindow):
def registerSubPluginActions(self, mainWindow):
# load plugins!
try:
exec (u"from .%s.plugins import load" % self.dbplugin().typeName())
exec (u"from .%s.plugins import load" % self.dbplugin().typeName(), globals())
except ImportError:
pass
else:
@@ -30,11 +30,6 @@
from ..plugin import ConnectionError, InvalidDataException, DBPlugin, Database, Schema, Table, VectorTable, RasterTable, \
TableField, TableConstraint, TableIndex, TableTrigger, TableRule

try:
from . import resources_rc
except ImportError:
pass

import re


@@ -23,7 +23,7 @@
from PyQt4.QtGui import QApplication

from ..info_model import DatabaseInfo
from ..html_elems import HtmlTable
from ..html_elems import HtmlTable, HtmlParagraph


class SLDatabaseInfo(DatabaseInfo):
@@ -31,11 +31,6 @@
from ..plugin import DBPlugin, Database, Table, VectorTable, RasterTable, TableField, TableIndex, TableTrigger, \
InvalidDataException

try:
from . import resources_rc
except ImportError:
pass


def classFactory():
return SpatiaLiteDBPlugin
@@ -19,31 +19,12 @@
***************************************************************************/
"""

from PyQt4.QtCore import (
QFile,
QUrl,
QTemporaryFile
)
from PyQt4.QtGui import (
QApplication
)

from ..connector import (
DBConnector
)
from ..plugin import (
ConnectionError,
DbError,
Table
)

from qgis.core import (
QGis,
QgsMapLayerRegistry,
QgsMapLayer,
QgsCoordinateReferenceSystem,
QgsDataSourceURI
)
from PyQt4.QtCore import QUrl, QTemporaryFile

from ..connector import DBConnector
from ..plugin import Table

from qgis.core import QGis, QgsDataSourceURI, QgsVirtualLayerDefinition, QgsMapLayerRegistry, QgsMapLayer, QgsVectorLayer, QgsCoordinateReferenceSystem

import sqlite3

@@ -26,9 +26,7 @@
from ..plugin import DbError

from PyQt4.QtCore import QUrl, QTime, QTemporaryFile
from qgis.core import QgsProviderRegistry, QgsErrorMessage, QGis, QgsVectorLayer

import os
from qgis.core import QGis, QgsVectorLayer


class LTableDataModel(TableDataModel):
@@ -22,16 +22,11 @@
# this will disable the dbplugin if the connector raise an ImportError
from .connector import VLayerConnector

from PyQt4.QtCore import Qt, QSettings, QUrl
from PyQt4.QtGui import QIcon, QApplication, QAction
from PyQt4.QtCore import QUrl
from PyQt4.QtGui import QIcon
from qgis.core import QgsVectorLayer, QgsMapLayerRegistry
from qgis.gui import QgsMessageBar

from ..plugin import DBPlugin, Database, Table, VectorTable, RasterTable, TableField, TableIndex, TableTrigger, InvalidDataException
try:
from . import resources_rc
except ImportError:
pass
from ..plugin import DBPlugin, Database, Table, VectorTable, TableField


def classFactory():
@@ -20,7 +20,7 @@
***************************************************************************/
"""

from PyQt4.QtCore import SIGNAL, SLOT, QSettings, Qt
from PyQt4.QtCore import SIGNAL, SLOT
from PyQt4.QtGui import QWidget, QTreeView, QMenu, QLabel

from qgis.core import QgsMapLayerRegistry, QgsMessageLog
@@ -21,8 +21,8 @@
Query builder dialog, based on the QSpatialite plugin (GPLv2+) by Romain Riviere
"""

from PyQt.QtCore import QObject, QEvent
from PyQt.QtWidgets import QDialog, QMessageBox
from PyQt4.QtCore import QObject, QEvent, SIGNAL
from PyQt4.QtGui import QDialog, QMessageBox, QTextEdit

from .ui.ui_DlgQueryBuilder import Ui_DbManagerQueryBuilderDlg as Ui_Dialog
from .db_plugins.plugin import VectorTable
@@ -301,7 +301,7 @@ def use_rtree(self):
tab_idx = idx.split(".")[0][1:-1] # remove "
col_idx = idx.split(".")[1][1:-1] # remove '
except:
pop_up_error("All fields are necessary", self)
pop_up_error("All fields are necessary", self) # FIXME
tgt = self.ui.table_target.currentText()
if tgt in (None, "", " ", "Table (Target)"):
return
@@ -22,9 +22,9 @@
***************************************************************************/
"""

from PyQt4.QtCore import Qt, QObject, QSettings, QByteArray, SIGNAL, pyqtSignal
from PyQt4.QtCore import Qt, pyqtSignal
from PyQt4.QtGui import QDialog, QWidget, QAction, QKeySequence, \
QDialogButtonBox, QApplication, QCursor, QMessageBox, QClipboard, QInputDialog, QIcon, QStyledItemDelegate, QStandardItemModel, QStandardItem
QApplication, QCursor, QClipboard, QInputDialog, QIcon, QStyledItemDelegate, QStandardItemModel, QStandardItem
from PyQt4.Qsci import QsciAPIs

from qgis.core import QgsProject
@@ -25,7 +25,7 @@

__revision__ = '$Format:%H$'

from qgis.core import *
from qgis.core import QgsMapLayerRegistry
from PyQt4.QtGui import QWidget, QVBoxLayout, QPushButton, QLabel, QPlainTextEdit, QLineEdit, QComboBox, QCheckBox
from processing.gui.AlgorithmDialog import AlgorithmDialog
from processing.gui.AlgorithmDialogBase import AlgorithmDialogBase

0 comments on commit c6d9217

Please sign in to comment.
You can’t perform that action at this time.