From 1cb21f14e896c48271681e15e6383f472b812762 Mon Sep 17 00:00:00 2001
From: Stefano Borini <sborini@enthought.com>
Date: Thu, 20 Jul 2017 13:05:13 +0100
Subject: [PATCH] Using relative imports

---
 force_bdss/base_core_driver.py       | 6 +++---
 force_bdss/base_extension_plugin.py  | 6 +++---
 force_bdss/bdss_application.py       | 9 +++++----
 force_bdss/bundle_registry_plugin.py | 9 +++++----
 force_bdss/core_evaluation_driver.py | 6 ++++--
 force_bdss/core_mco_driver.py        | 8 +++++---
 6 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/force_bdss/base_core_driver.py b/force_bdss/base_core_driver.py
index 4d7a942..ca884cc 100644
--- a/force_bdss/base_core_driver.py
+++ b/force_bdss/base_core_driver.py
@@ -1,12 +1,12 @@
 from envisage.plugin import Plugin
 from traits.trait_types import Instance
 
-from force_bdss.bundle_registry_plugin import (
+from .bundle_registry_plugin import (
     BundleRegistryPlugin,
     BUNDLE_REGISTRY_PLUGIN_ID
 )
-from force_bdss.io.workflow_reader import WorkflowReader
-from force_bdss.workspecs.workflow import Workflow
+from .io.workflow_reader import WorkflowReader
+from .workspecs.workflow import Workflow
 
 
 class BaseCoreDriver(Plugin):
diff --git a/force_bdss/base_extension_plugin.py b/force_bdss/base_extension_plugin.py
index 3627b13..f940d35 100644
--- a/force_bdss/base_extension_plugin.py
+++ b/force_bdss/base_extension_plugin.py
@@ -1,9 +1,9 @@
 from envisage.plugin import Plugin
 from traits.trait_types import List
 
-from force_bdss.data_sources.i_data_source_bundle import IDataSourceBundle
-from force_bdss.kpi.i_kpi_calculator_bundle import IKPICalculatorBundle
-from force_bdss.mco.i_multi_criteria_optimizer_bundle import \
+from .data_sources.i_data_source_bundle import IDataSourceBundle
+from .kpi.i_kpi_calculator_bundle import IKPICalculatorBundle
+from .mco.i_multi_criteria_optimizer_bundle import \
     IMultiCriteriaOptimizerBundle
 
 
diff --git a/force_bdss/bdss_application.py b/force_bdss/bdss_application.py
index 3955e36..1d74d06 100644
--- a/force_bdss/bdss_application.py
+++ b/force_bdss/bdss_application.py
@@ -1,13 +1,14 @@
 from stevedore import extension
 from stevedore.exception import NoMatches
+
 from envisage.api import Application
 from envisage.core_plugin import CorePlugin
+from traits.api import Unicode, Bool
 
-from force_bdss.bundle_registry_plugin import BundleRegistryPlugin
-from force_bdss.core_evaluation_driver import CoreEvaluationDriver
-from force_bdss.core_mco_driver import CoreMCODriver
+from .bundle_registry_plugin import BundleRegistryPlugin
+from .core_evaluation_driver import CoreEvaluationDriver
+from .core_mco_driver import CoreMCODriver
 
-from traits.api import Unicode, Bool
 
 
 class BDSSApplication(Application):
diff --git a/force_bdss/bundle_registry_plugin.py b/force_bdss/bundle_registry_plugin.py
index f0e418c..2655bf7 100644
--- a/force_bdss/bundle_registry_plugin.py
+++ b/force_bdss/bundle_registry_plugin.py
@@ -2,11 +2,12 @@ from envisage.extension_point import ExtensionPoint
 from envisage.plugin import Plugin
 from traits.api import List
 
-from force_bdss.data_sources.i_data_source_bundle import (
+from .data_sources.i_data_source_bundle import (
     IDataSourceBundle)
-from force_bdss.kpi.i_kpi_calculator_bundle import IKPICalculatorBundle
-from force_bdss.mco.i_multi_criteria_optimizer_bundle import (
-    IMultiCriteriaOptimizerBundle)
+from .kpi.i_kpi_calculator_bundle import IKPICalculatorBundle
+from .mco.i_multi_criteria_optimizer_bundle import (
+    IMultiCriteriaOptimizerBundle
+)
 
 
 BUNDLE_REGISTRY_PLUGIN_ID = "force.bdss.plugins.bundle_registry"
diff --git a/force_bdss/core_evaluation_driver.py b/force_bdss/core_evaluation_driver.py
index 08c8576..d28def3 100644
--- a/force_bdss/core_evaluation_driver.py
+++ b/force_bdss/core_evaluation_driver.py
@@ -3,9 +3,11 @@ from __future__ import print_function
 import sys
 from traits.api import on_trait_change
 
-from force_bdss.base_core_driver import BaseCoreDriver
-from force_bdss.io.workflow_reader import InvalidVersionException, \
+from .base_core_driver import BaseCoreDriver
+from .io.workflow_reader import (
+    InvalidVersionException,
     InvalidFileException
+)
 
 
 class CoreEvaluationDriver(BaseCoreDriver):
diff --git a/force_bdss/core_mco_driver.py b/force_bdss/core_mco_driver.py
index b4e6135..4d3d52a 100644
--- a/force_bdss/core_mco_driver.py
+++ b/force_bdss/core_mco_driver.py
@@ -4,9 +4,11 @@ import sys
 
 from traits.api import on_trait_change
 
-from force_bdss.base_core_driver import BaseCoreDriver
-from force_bdss.io.workflow_reader import (InvalidVersionException,
-                                           InvalidFileException)
+from .base_core_driver import BaseCoreDriver
+from .io.workflow_reader import (
+    InvalidVersionException,
+    InvalidFileException
+)
 
 
 class CoreMCODriver(BaseCoreDriver):
-- 
GitLab