fix mac issues

warrieka · Jan 25, 2019 · dea575e · dea575e
1 parent 8cd7e49
commit dea575e
Show file tree

Hide file tree

Showing 14 changed files with 5 additions and 28 deletions.
diff --git a/geopunt4QgisAbout.py b/geopunt4QgisAbout.py
@@ -19,7 +19,6 @@
 *                                                                         *
 ***************************************************************************/
 """
-from __future__ import absolute_import
 import os.path
 from qgis.PyQt.QtCore import Qt, QSettings, QTranslator, QCoreApplication
 from qgis.PyQt.QtWidgets import QPushButton, QDialog, QDialogButtonBox

diff --git a/geopunt4QgisBatchGeoCode.py b/geopunt4QgisBatchGeoCode.py
@@ -19,7 +19,6 @@
 *                                                                         *
 ***************************************************************************/
 """
-from __future__ import absolute_import
 import csv, webbrowser, os.path
 from qgis.PyQt.QtCore import Qt, QSettings, QTranslator, QCoreApplication
 from qgis.PyQt.QtWidgets import (QDialog, QDialogButtonBox, QPushButton, QInputDialog, 
@@ -363,19 +362,9 @@ def validateRows(self , rowIds):
               try:  
                 validAdres = self.am.findAdresSuggestions(municipality=muni, postalcode=pc, housenr=huisNr, streetname=adres)
               except:
-                validAdres = None
+                validAdres = []
 
-              if validAdres and type( validAdres ) is str: 
-                if (validAdres == 'time out') & (retry > 0): 
-                    retry -= 1                        #minus 1 retry
-                    continue
-                elif retry == 0:
-                    self.ui.statusMsg.setText("<div style='color:red'>timeout na %s seconden and %s pogingen</div>" % (self.timeout , self.retrys))
-                    return
-                self.ui.statusMsg.setText("<div style='color:red'>%s</div>" % validAdres)
-                return
-
-              elif validAdres and type( validAdres ) is list: 
+              if type( validAdres ) is list: 
                 if len(validAdres) > 1 and len( validAdres[0].split(',')) >= 2 and len(adres.strip()): 
                    resultNR =  validAdres[0].split(',')[0].split()[-1] if len(validAdres[0].split(',')[0].split()) > 0 else validAdres[0]
                    adresNR = adres.split(',')[0].split()[-1] if len(adres.split(',')[0].split()) > 0 else adres

diff --git a/geopunt4QgisDataCatalog.py b/geopunt4QgisDataCatalog.py
@@ -19,7 +19,6 @@
 *                                                                         *
 ***************************************************************************/
 """
-from __future__ import absolute_import
 from qgis.PyQt.QtCore import Qt, QSettings, QTranslator, QCoreApplication, QRegExp, QSortFilterProxyModel, QStringListModel
 from qgis.PyQt.QtWidgets import QDialog, QPushButton, QDialogButtonBox, QCompleter, QInputDialog, QSizePolicy, QMessageBox
 from qgis.PyQt.QtGui import QStandardItem, QStandardItemModel

diff --git a/geopunt4QgisElevation.py b/geopunt4QgisElevation.py
@@ -19,7 +19,6 @@
 *                                                                         *
 ***************************************************************************/
 """
-from __future__ import absolute_import
 from qgis.PyQt.QtCore import Qt, QSettings, QTranslator, QCoreApplication 
 from qgis.PyQt.QtWidgets import (QDialog, QPushButton, QDialogButtonBox, QFileDialog, QSizePolicy,
                                  QToolButton, QColorDialog, QInputDialog)

diff --git a/geopunt4QgisGipod.py b/geopunt4QgisGipod.py
@@ -19,7 +19,6 @@
 *                                                                         *
 ***************************************************************************/
 """
-from __future__ import absolute_import
 from builtins import str
 from qgis.PyQt.QtCore import Qt, QSettings, QTranslator, QCoreApplication 
 from qgis.PyQt.QtWidgets import QDialog, QPushButton, QDialogButtonBox, QMessageBox

diff --git a/geopunt4QgisParcel.py b/geopunt4QgisParcel.py
@@ -19,7 +19,6 @@
 *                                                                         *
 ***************************************************************************/
 """
-from __future__ import absolute_import
 from builtins import str
 from qgis.PyQt.QtCore import Qt, QSettings, QTranslator, QCoreApplication, QStringListModel
 from qgis.PyQt.QtWidgets import QDialog, QPushButton, QDialogButtonBox, QSizePolicy, QInputDialog, QCompleter

diff --git a/geopunt4QgisPoidialog.py b/geopunt4QgisPoidialog.py
@@ -19,7 +19,6 @@
 *                                                                         *
 ***************************************************************************/
 """
-from __future__ import absolute_import
 from qgis.PyQt.QtCore import Qt, QSettings, QTranslator, QCoreApplication 
 from qgis.PyQt.QtWidgets import QDialog, QPushButton, QDialogButtonBox, QSizePolicy, QInputDialog, QTableWidgetItem
 from qgis.PyQt.QtGui import QColor

diff --git a/geopunt4QgisSettingsdialog.py b/geopunt4QgisSettingsdialog.py
@@ -19,7 +19,6 @@
 *                                                                         *
 ***************************************************************************/
 """
-from __future__ import absolute_import
 from qgis.PyQt.QtCore import Qt, QSettings, QTranslator, QCoreApplication 
 from qgis.PyQt.QtWidgets import QDialog, QPushButton, QDialogButtonBox, QFileDialog
 from .ui_geopunt4QgisSettings import Ui_settingsDlg

diff --git a/geopunt4qgis.py b/geopunt4qgis.py
@@ -19,7 +19,6 @@
  *                                                                         *
  ***************************************************************************/
 """
-from __future__ import absolute_import
 from qgis.PyQt.QtCore import QSettings, QCoreApplication, QTranslator 
 from qgis.PyQt.QtWidgets import QMessageBox, QAction, QPushButton, QInputDialog
 from qgis.PyQt.QtGui import QColor, QIcon

diff --git a/metadata.txt b/metadata.txt
@@ -22,15 +22,15 @@ about="Geopunt voor QGIS" is een plugin voor de QGIS open source desktop GIS, di
     - Search for Parcels 
     - Search for layers in the geopunt catalog
 
-version=2.0.5
+version=2.0.7
 author=Kay Warrie
 [email protected]
 
 # end of mandatory metadata
 
 # Optional items:
 # Uncomment the following line and add your changelog entries:
-changelog=Gemeentefusies 2019, waarschuwing indien metadata site niet bereikbaar. 
+changelog=Some apple osx specific errors fixed
 
 # tags are comma separated with spaces allowed
 tags=INSPIRE, GEOPUNT, GDI, VLAANDEREN, BRUSSEL, BELGIE, ADRES, ADRESSEN, AGIV, GEOLOKATIE, GEOCODE, WEBSERVICE, GRB, CRAB, FLANDERS, BELGIUM, BRUSSELS, LOCATION, ADDRESS, POINT OF INTEREST, POI, URBIS, GIPOD

diff --git a/tools/batchGeo.py b/tools/batchGeo.py
@@ -19,7 +19,6 @@
 *                                                                         *
 ***************************************************************************/
 """
-from __future__ import absolute_import
 import os.path
 from .geometry import geometryHelper
 from qgis.PyQt.QtCore import QVariant

diff --git a/tools/elevation.py b/tools/elevation.py
@@ -19,7 +19,6 @@
 *                                                                         *
 ***************************************************************************/
 """
-from __future__ import absolute_import
 import os.path
 import numpy as np
 from qgis.PyQt.QtCore import QVariant

diff --git a/tools/gipod.py b/tools/gipod.py
@@ -19,8 +19,6 @@
 *                                                                         *
 ***************************************************************************/
 """
-from future import standard_library
-standard_library.install_aliases()
 import os.path 
 from qgis.PyQt.QtCore import QVariant
 from qgis.PyQt.QtWidgets import QFileDialog

diff --git a/tools/versionChecker.py b/tools/versionChecker.py
@@ -46,4 +46,4 @@ def isUptoDate(self):
         if cur < latest: 
            return False
         else:
-           return True
+           return True