Commit afe5edaf authored by Ruben Undheim's avatar Ruben Undheim

Use 'from __future__ import absolute_import' to fix import in Python 2

parent b6e81f69
......@@ -3,54 +3,47 @@ Date: Sun, 10 Feb 2019 12:55:06 +0000
Subject: Fix some imports to make python interface work
---
openEMS/python/openEMS/__init__.py | 3 ++-
openEMS/python/openEMS/nf2ff.py | 4 ++--
openEMS/python/openEMS/ports.py | 6 +++---
3 files changed, 7 insertions(+), 6 deletions(-)
openEMS/python/openEMS/__init__.py | 2 ++
openEMS/python/openEMS/nf2ff.py | 1 +
openEMS/python/openEMS/ports.py | 3 ++-
3 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/openEMS/python/openEMS/__init__.py b/openEMS/python/openEMS/__init__.py
index fb1ddb9..b54ab97 100644
index fb1ddb9..734aa76 100644
--- a/openEMS/python/openEMS/__init__.py
+++ b/openEMS/python/openEMS/__init__.py
@@ -1,4 +1,5 @@
@@ -1,4 +1,6 @@
# -*- coding: utf-8 -*-
#
# Shortcut openEMS import
-from openEMS.openEMS import openEMS
+#from openEMS.openEMS import openEMS
+from openEMS import openEMS
+from __future__ import absolute_import
+
from openEMS.openEMS import openEMS
diff --git a/openEMS/python/openEMS/nf2ff.py b/openEMS/python/openEMS/nf2ff.py
index b6d38d0..5b3ffc1 100644
index b6d38d0..b3792ff 100644
--- a/openEMS/python/openEMS/nf2ff.py
+++ b/openEMS/python/openEMS/nf2ff.py
@@ -19,8 +19,8 @@
@@ -15,6 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
+from __future__ import absolute_import
import os
import numpy as np
import h5py
-from openEMS import _nf2ff
-from openEMS import utilities
+import _nf2ff
+import utilities
class nf2ff:
"""
diff --git a/openEMS/python/openEMS/ports.py b/openEMS/python/openEMS/ports.py
index 1af1564..1e42a8f 100644
index 1af1564..5b4fdc0 100644
--- a/openEMS/python/openEMS/ports.py
+++ b/openEMS/python/openEMS/ports.py
@@ -19,9 +19,9 @@
@@ -15,6 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
+from __future__ import absolute_import
import os
import numpy as np
from CSXCAD.Utilities import CheckNyDir
-from openEMS import utilities
+import utilities
-from openEMS.physical_constants import *
+from physical_constants import *
class UI_data:
def __init__(self, fns, path, freq, signal_type='pulse', **kw):
@@ -45,7 +45,7 @@ class UI_data:
@@ -45,7 +46,7 @@ class UI_data:
self.ui_f_val.append(utilities.DFT_time2freq(tmp[:,0], tmp[:,1], freq, signal_type=signal_type))
# Port Base-Class
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment