From 6cf1a873918fba87660d640399c1c7bbe9dbee51 Mon Sep 17 00:00:00 2001
From: Unknown <mdryden@chem.utoronto.ca>
Date: Wed, 11 Oct 2017 18:07:26 -0400
Subject: [PATCH] Remove relative imports from main.
---
dstat_interface/main.py | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/dstat_interface/main.py b/dstat_interface/main.py
index 9001281..fcf6e43 100755
--- a/dstat_interface/main.py
+++ b/dstat_interface/main.py
@@ -30,8 +30,20 @@ from copy import deepcopy
from collections import OrderedDict
from datetime import datetime
import logging
-
from pkg_resources import parse_version
+
+from serial import SerialException
+import zmq
+
+import core
+from core.utils.version import getVersion
+from core.experiments import idle, pot
+from core import params, analysis, dstat
+from core.interface import (exp_window, adc_pot, plot_ui, data_view,
+ save, hw_info)
+from core.errors import InputError
+from core.plugin import DstatPlugin, get_hub_uri
+
try:
import gi
gi.require_version('Gtk', '3.0')
@@ -40,24 +52,12 @@ except ImportError:
print("ERR: GTK not available")
sys.exit(1)
-from serial import SerialException
-
-import zmq
-
mod_dir = os.path.dirname(os.path.abspath(__file__))
conf_path = os.path.join(os.path.expanduser("~"), '.dstat-interface')
# if __name__ == "__parents_main__": # Only runs for forking emulation on win
# sys.path.append(mod_dir)
-from .core.utils.version import getVersion
-from .core.experiments import idle, pot
-from .core import params, analysis, dstat
-from .core.interface import (exp_window, adc_pot, plot_ui, data_view,
- save, hw_info)
-from .core.errors import InputError
-from .core.plugin import DstatPlugin, get_hub_uri
-
# Setup Logging
logger = logging.getLogger(__name__)
core_logger = logging.getLogger("core")
--
GitLab