Removed relative imports.

OSTranslatorII/__init__.py

@@ -13,5 +13,5 @@
 
 def classFactory(iface):
     """Load OsTranslatorII class from file OsTranslatorII."""
-    from .os_translator_ii import OsTranslatorII
+    from OSTranslatorII.os_translator_ii import OsTranslatorII
     return OsTranslatorII(iface)

OSTranslatorII/import_manager.py

@@ -10,8 +10,7 @@
 # (at your option) any later version.
 
 from __future__ import absolute_import
-from builtins import str
-from .import_task import *
+from OSTranslatorII.import_task import *
 import time
 
 class ImportManager(QObject):

OSTranslatorII/metadata.txt

@@ -15,7 +15,10 @@ [email protected]
 # Optional items:
 
 # Uncomment the following line and add your changelog:
-changelog=3.2.5 Bug fixes:
+changelog=3.2.7 Bug fixes:
+ - fixed postprocessing while running in the CLI mode
+ - removed relative imports
+<p>3.2.5 Bug fixes:
  - applying OS styles
  - cores number to be used (#54)
  <p>3.2.4 Bug fixes:

OSTranslatorII/os-translator-ii-cli.py

@@ -12,19 +12,20 @@
 # Fix ValueError: API 'QDate' has already been set to version 1
 from __future__ import print_function
 from __future__ import absolute_import
+import os
+import sys
+sys.path.append(os.path.dirname(os.path.dirname(__file__)))
 try:
     import qgis.PyQt
 except ImportError:
     pass
 
 import traceback
-import sys
 import argparse
-import os
 from qgis.PyQt import QtCore
-from .import_manager import ImportManager
-from .post_processor_thread import PostProcessorThread
-from .utils import (
+from import_manager import ImportManager
+from post_processor_thread import PostProcessorThread
+from utils import (
     build_args,
     get_input_files,
     get_pioneer_file,

OSTranslatorII/os-translator-ii-standalone.py

@@ -18,7 +18,7 @@
 
 import sys
 from qgis.PyQt import QtGui
-from .os_translator_ii_dialog import OsTranslatorIIDialog
+from OSTranslatorII.os_translator_ii_dialog import OsTranslatorIIDialog
 
 def main():
     app = QtGui.QApplication(sys.argv)

OSTranslatorII/os_translator_ii.py

@@ -10,15 +10,14 @@
 # (at your option) any later version.
 
 from __future__ import absolute_import
-from builtins import object
 from qgis.PyQt.QtWidgets import QAction
 from qgis.PyQt.QtGui import QIcon
 
-from .os_translator_ii_dialog import OsTranslatorIIDialog
-from .utils import OSII_icon_path
+from OSTranslatorII.os_translator_ii_dialog import OsTranslatorIIDialog
+from OSTranslatorII.utils import OSII_icon_path
 
 
-class OsTranslatorII(object):
+class OsTranslatorII:
     """QGIS Plugin Implementation."""
 
     def __init__(self, iface):

OSTranslatorII/os_translator_ii_dialog.py

@@ -14,10 +14,10 @@
 import xml.etree.ElementTree as ET
 
 from math import floor
-from .import_manager import *
-from .result_dialog import *
-from .post_processor_thread import *
-from .utils import *
+from OSTranslatorII.import_manager import *
+from OSTranslatorII.result_dialog import *
+from OSTranslatorII.post_processor_thread import *
+from OSTranslatorII.utils import *
 
 try:
     from qgis.core import QgsDataSourceURI, QgsSettings

OSTranslatorII/post_processor_thread.py

@@ -14,7 +14,7 @@
 import traceback
 import sys
 from qgis.PyQt.QtCore import *
-from .styler import *
+from OSTranslatorII.styler import *
 
 class PostProcessorThread(QThread):
 

OSTranslatorII/result_dialog.py

@@ -11,7 +11,7 @@
 
 from __future__ import absolute_import
 import os
-from .utils import OSII_icon_path
+from OSTranslatorII.utils import OSII_icon_path
 
 from qgis.PyQt import QtGui, QtCore, uic
 from qgis.PyQt import QtWidgets

OSTranslatorII/styler.py

@@ -10,18 +10,17 @@
 # (at your option) any later version.
 
 from __future__ import absolute_import
-from builtins import object
 import psycopg2
 try:
     from qgis.core import QgsVectorLayer
 except ImportError:
     pass  # We may be calling the script from the console in which case this import is not used
 
 from qgis.PyQt.Qt import QDomDocument
-from . import utils
+from OSTranslatorII import utils
 
 
-class Styler(object):
+class Styler:
     def __init__(self, cur, uri, schema, osmm_schema, osmm_style_name):
         self.cur = cur
         self.uri = uri

OSTranslatorII/utils.py

@@ -39,18 +39,17 @@ def OSII_icon_path():
 def download(packageUrl, destinationFileName):
     handle = tempfile.NamedTemporaryFile(delete=False, suffix=destinationFileName)
     name = handle.name
-
     try:
-        from qgis.core import QgsNetworkAccessManager
-        _download_qgis(packageUrl, handle)
-
+        import qgis.utils
+        in_qgis = qgis.utils.iface is not None
+        if in_qgis:
+            _download_qgis(packageUrl, handle)
+        else:
+            _download_urllib2(packageUrl, handle)
     except ImportError:
-        # in case we are using cli and qgis is not installed
         _download_urllib2(packageUrl, handle)
-    except Exception as err:
-        # in case we are using cli and qgis is not installed
+    except Exception:
         _download_urllib2(packageUrl, handle)
-
     handle.close()
     return name