Clean up imports

dss-extensions · Jul 16, 2022 · 4bb762e · 4bb762e
1 parent 4df844f
commit 4bb762e
Show file tree

Hide file tree

Showing 47 changed files with 56 additions and 70 deletions.
diff --git a/opendssdirect/ActiveClass.py b/opendssdirect/ActiveClass.py
@@ -1,4 +1,4 @@
-from ._utils import codec, CheckForError, api_util, Base
+from ._utils import  api_util, Base
 
 
 class IActiveClass(Base):

diff --git a/opendssdirect/Basic.py b/opendssdirect/Basic.py
@@ -1,4 +1,4 @@
-from ._utils import codec, api_util, Base
+from ._utils import api_util, Base
 
 
 class IBasic(Base):

diff --git a/opendssdirect/Bus.py b/opendssdirect/Bus.py
@@ -1,4 +1,4 @@
-from ._utils import CheckForError, api_util, Base
+from ._utils import api_util, Base
 
 
 class IBus(Base):

diff --git a/opendssdirect/CNData.py b/opendssdirect/CNData.py
@@ -1,4 +1,4 @@
-from ._utils import CheckForError, api_util, Iterable
+from ._utils import api_util, Iterable
 
 
 class ICNData(Iterable):

diff --git a/opendssdirect/CapControls.py b/opendssdirect/CapControls.py
@@ -1,4 +1,4 @@
-from ._utils import codec, CheckForError, api_util, Iterable
+from ._utils import  api_util, Iterable
 
 
 class ICapControls(Iterable):

diff --git a/opendssdirect/Capacitors.py b/opendssdirect/Capacitors.py
@@ -1,4 +1,4 @@
-from ._utils import CheckForError, api_util, Iterable
+from ._utils import api_util, Iterable
 
 
 class ICapacitors(Iterable):

diff --git a/opendssdirect/Circuit.py b/opendssdirect/Circuit.py
@@ -1,4 +1,4 @@
-from ._utils import codec, CheckForError, api_util, Base
+from ._utils import  api_util, Base
 
 
 class ICircuit(Base):

diff --git a/opendssdirect/CktElement.py b/opendssdirect/CktElement.py
@@ -1,4 +1,4 @@
-from ._utils import ffi, codec, DSSException, api_util, Base
+from ._utils import DSSException, api_util, Base
 
 
 class ICktElement(Base):

diff --git a/opendssdirect/CtrlQueue.py b/opendssdirect/CtrlQueue.py
@@ -1,4 +1,4 @@
-from ._utils import CheckForError, api_util, Base
+from ._utils import api_util, Base
 
 
 class ICtrlQueue(Base):

diff --git a/opendssdirect/Element.py b/opendssdirect/Element.py
@@ -1,4 +1,4 @@
-from ._utils import CheckForError, api_util, Base
+from ._utils import api_util, Base
 
 
 class IElement(Base):

diff --git a/opendssdirect/Executive.py b/opendssdirect/Executive.py
@@ -1,4 +1,4 @@
-from ._utils import CheckForError, api_util, Base
+from ._utils import api_util, Base
 
 
 class IExecutive(Base):

diff --git a/opendssdirect/Fuses.py b/opendssdirect/Fuses.py
@@ -1,4 +1,4 @@
-from ._utils import codec, CheckForError, api_util, Iterable
+from ._utils import  api_util, Iterable
 
 
 class IFuses(Iterable):

diff --git a/opendssdirect/Generators.py b/opendssdirect/Generators.py
@@ -1,4 +1,4 @@
-from ._utils import codec, CheckForError, api_util, Iterable
+from ._utils import  api_util, Iterable
 
 
 class IGenerators(Iterable):

diff --git a/opendssdirect/Isource.py b/opendssdirect/Isource.py
@@ -1,4 +1,4 @@
-from ._utils import CheckForError, api_util, Iterable
+from ._utils import api_util, Iterable
 
 
 class IIsource(Iterable):

diff --git a/opendssdirect/LineCodes.py b/opendssdirect/LineCodes.py
@@ -1,4 +1,4 @@
-from ._utils import CheckForError, api_util, Iterable
+from ._utils import api_util, Iterable
 
 
 class ILineCodes(Iterable):

diff --git a/opendssdirect/LineGeometries.py b/opendssdirect/LineGeometries.py
@@ -1,4 +1,4 @@
-from ._utils import CheckForError, api_util, Iterable
+from ._utils import api_util, Iterable
 
 
 class ILineGeometries(Iterable):

diff --git a/opendssdirect/LineSpacings.py b/opendssdirect/LineSpacings.py
@@ -1,4 +1,4 @@
-from ._utils import CheckForError, api_util, Iterable
+from ._utils import api_util, Iterable
 
 
 class ILineSpacings(Iterable):

diff --git a/opendssdirect/Lines.py b/opendssdirect/Lines.py
@@ -1,4 +1,4 @@
-from ._utils import codec, CheckForError, api_util, Iterable
+from ._utils import  api_util, Iterable
 
 
 class ILines(Iterable):

diff --git a/opendssdirect/LoadShape.py b/opendssdirect/LoadShape.py
@@ -1,4 +1,4 @@
-from ._utils import codec, CheckForError, api_util, Iterable
+from ._utils import  api_util, Iterable
 
 
 class ILoadShape(Iterable):

diff --git a/opendssdirect/Loads.py b/opendssdirect/Loads.py
@@ -1,4 +1,4 @@
-from ._utils import codec, CheckForError, api_util, Iterable
+from ._utils import  api_util, Iterable
 
 
 class ILoads(Iterable):

diff --git a/opendssdirect/Meters.py b/opendssdirect/Meters.py
@@ -1,4 +1,4 @@
-from ._utils import codec, CheckForError, api_util, Iterable
+from ._utils import  api_util, Iterable
 
 
 class IMeters(Iterable):

diff --git a/opendssdirect/PDElements.py b/opendssdirect/PDElements.py
@@ -1,4 +1,4 @@
-from ._utils import codec, CheckForError, api_util, Base
+from ._utils import  api_util, Base
 
 
 class IPDElements(Base):

diff --git a/opendssdirect/PVsystems.py b/opendssdirect/PVsystems.py
@@ -1,4 +1,4 @@
-from ._utils import codec, CheckForError, api_util, Iterable
+from ._utils import  api_util, Iterable
 
 
 class IPVsystems(Iterable):

diff --git a/opendssdirect/Parallel.py b/opendssdirect/Parallel.py
@@ -1,4 +1,4 @@
-from ._utils import CheckForError, api_util, Base
+from ._utils import api_util, Base
 
 
 class IParallel(Base):

diff --git a/opendssdirect/Parser.py b/opendssdirect/Parser.py
@@ -1,4 +1,4 @@
-from ._utils import codec, CheckForError, api_util, Base
+from ._utils import  api_util, Base
 
 
 class IParser(Base):

diff --git a/opendssdirect/Progress.py b/opendssdirect/Progress.py
@@ -1,4 +1,4 @@
-from ._utils import codec, CheckForError, api_util, Base
+from ._utils import  api_util, Base
 
 
 class IProgress(Base):

diff --git a/opendssdirect/Reactors.py b/opendssdirect/Reactors.py
@@ -1,4 +1,4 @@
-from ._utils import codec, CheckForError, api_util, Iterable
+from ._utils import  api_util, Iterable
 
 
 class IReactors(Iterable):

diff --git a/opendssdirect/Reclosers.py b/opendssdirect/Reclosers.py
@@ -1,4 +1,4 @@
-from ._utils import codec, CheckForError, api_util, Iterable
+from ._utils import  api_util, Iterable
 
 
 class IReclosers(Iterable):

diff --git a/opendssdirect/ReduceCkt.py b/opendssdirect/ReduceCkt.py
@@ -1,4 +1,4 @@
-from ._utils import codec, CheckForError, api_util, Base
+from ._utils import  api_util, Base
 
 
 class IReduceCkt(Base):

diff --git a/opendssdirect/RegControls.py b/opendssdirect/RegControls.py
@@ -1,4 +1,4 @@
-from ._utils import codec, CheckForError, api_util, Iterable
+from ._utils import  api_util, Iterable
 
 
 class IRegControls(Iterable):

diff --git a/opendssdirect/Relays.py b/opendssdirect/Relays.py
@@ -1,4 +1,4 @@
-from ._utils import codec, CheckForError, api_util, Iterable
+from ._utils import  api_util, Iterable
 
 
 class IRelays(Iterable):

diff --git a/opendssdirect/Sensors.py b/opendssdirect/Sensors.py
@@ -1,4 +1,4 @@
-from ._utils import codec, CheckForError, api_util, Iterable
+from ._utils import  api_util, Iterable
 
 
 class ISensors(Iterable):

diff --git a/opendssdirect/Settings.py b/opendssdirect/Settings.py
@@ -1,4 +1,4 @@
-from ._utils import codec, CheckForError, api_util, Base
+from ._utils import  api_util, Base
 
 
 class ISettings(Base):

diff --git a/opendssdirect/Solution.py b/opendssdirect/Solution.py
@@ -1,4 +1,4 @@
-from ._utils import codec, CheckForError, api_util, Base
+from ._utils import  api_util, Base
 
 
 class ISolution(Base):

diff --git a/opendssdirect/Storages.py b/opendssdirect/Storages.py
@@ -1,4 +1,4 @@
-from ._utils import CheckForError, api_util, Iterable
+from ._utils import api_util, Iterable
 
 
 class IStorages(Iterable):

diff --git a/opendssdirect/SwtControls.py b/opendssdirect/SwtControls.py
@@ -1,4 +1,4 @@
-from ._utils import codec, CheckForError, api_util, Iterable
+from ._utils import  api_util, Iterable
 
 
 class ISwtControls(Iterable):

diff --git a/opendssdirect/TSData.py b/opendssdirect/TSData.py
@@ -1,4 +1,4 @@
-from ._utils import CheckForError, api_util, Iterable
+from ._utils import api_util, Iterable
 
 
 class ITSData(Iterable):

diff --git a/opendssdirect/Text.py b/opendssdirect/Text.py
@@ -1,4 +1,4 @@
-from ._utils import codec, CheckForError, api_util, Base
+from ._utils import  api_util, Base
 
 
 class IText(Base):

diff --git a/opendssdirect/Topology.py b/opendssdirect/Topology.py
@@ -1,4 +1,4 @@
-from ._utils import codec, CheckForError, api_util, Base
+from ._utils import  api_util, Base
 
 
 class ITopology(Base):

diff --git a/opendssdirect/Transformers.py b/opendssdirect/Transformers.py
@@ -1,4 +1,4 @@
-from ._utils import codec, CheckForError, api_util, Iterable
+from ._utils import  api_util, Iterable
 
 
 class ITransformers(Iterable):

diff --git a/opendssdirect/Vsources.py b/opendssdirect/Vsources.py
@@ -1,4 +1,4 @@
-from ._utils import CheckForError, api_util, Iterable
+from ._utils import api_util, Iterable
 
 
 class IVsources(Iterable):

diff --git a/opendssdirect/WireData.py b/opendssdirect/WireData.py
@@ -1,4 +1,4 @@
-from ._utils import CheckForError, api_util, Iterable
+from ._utils import api_util, Iterable
 
 
 class IWireData(Iterable):

diff --git a/opendssdirect/XYCurves.py b/opendssdirect/XYCurves.py
@@ -1,4 +1,4 @@
-from ._utils import CheckForError, api_util, Iterable
+from ._utils import api_util, Iterable
 
 
 class IXYCurves(Iterable):

diff --git a/opendssdirect/YMatrix.py b/opendssdirect/YMatrix.py
@@ -1,5 +1,5 @@
 import numpy as np
-from ._utils import ffi, CheckForError, api_util, Base
+from ._utils import api_util, Base
 
 
 class IYMatrix(Base):

diff --git a/opendssdirect/ZIP.py b/opendssdirect/ZIP.py
@@ -1,4 +1,4 @@
-from ._utils import ffi, api_util, codec, CheckForError, api_util, Base
+from ._utils import api_util, Base
 
 
 class IZIP(Base):

diff --git a/opendssdirect/_utils.py b/opendssdirect/_utils.py
@@ -1,26 +1,9 @@
 # Import dss_python
 import dss as dss_py
-import numpy as np
-import warnings
 from .Iterable import Iterable, Base
 
-# Bind to the FFI module instance. This should be refined in a future version,
-# especially after DSS C-API 0.11 is fully released.
-lib = dss_py.v7.api_util.lib
-ffi = dss_py.v7.api_util.ffi
-api_util = dss_py.v7.api_util
-codec = api_util.codec
-CheckForError = dss_py.v7.DSS_IR.CheckForError
+# Bind to the FFI module instance and default/prime OpenDSS instance
+lib = dss_py.api_util.lib
+ffi = dss_py.api_util.ffi
+api_util = dss_py.api_util
 DSSException = dss_py._cffi_api_util.DSSException
-
-# Currently, we prefer the functions that return lists (suffix 2)
-# to keep higher compatibility with previous versions of OpenDSSDirect.py.
-
-get_string = api_util.get_string
-get_float64_array = api_util.get_float64_array2
-get_int32_array = api_util.get_int32_array2
-get_int8_array = api_util.get_int8_array2
-get_string_array = api_util.get_string_array2
-prepare_float64_array = api_util.prepare_float64_array
-prepare_int32_array = api_util.prepare_int32_array
-prepare_string_array = api_util.prepare_string_array
diff --git a/opendssdirect/utils.py b/opendssdirect/utils.py
@@ -1,7 +1,6 @@
 import inspect
 import warnings
-from ._utils import get_string, dss_py
-from . import _utils
+from ._utils import dss_py
 from .Iterable import Iterable
 
 is_pandas_installed = True
@@ -41,13 +40,17 @@ def __iter__(self):
 
 def run_command(text, dss=None):
     """Use Text interface of OpenDSS"""
+
+    warnings.warn('run_command is deprecated, see https://github.com/dss-extensions/OpenDSSDirect.py/issues/70')
+
     if dss is None:
         import opendssdirect as dss
 
+    api_util = dss.Basic._api_util
     r = []
     for l in text.splitlines():
-        dss.dss_lib.Text_Set_Command(l.encode(_utils.codec))
-        r.append(get_string(dss.dss_lib.Text_Get_Result()))
+        dss.dss_lib.Text_Set_Command(l.encode(api_util.codec))
+        r.append(api_util.get_string(dss.dss_lib.Text_Get_Result()))
 
     return "\n".join(r).strip()