[moose-devel] [PATCH 16/19] Convert to relative imports

[Zbigniew Jędrzejewski-S. <zb...@in...>]

---
 python/moose/alternate.py                             | 6 +++---
 python/moose/graphutil.py                             | 2 +-
 python/moose/hdfutil.py                               | 2 +-
 python/moose/mtypes.py                                | 2 +-
 python/moose/multiscale/parser/MorphML.py             | 2 +-
 python/moose/multiscale/parser/NetworkML.py           | 6 +++---
 python/moose/multiscale/parser/NeuroML.py             | 6 +++---
 python/moose/neuroml/MorphML.py                       | 2 +-
 python/moose/neuroml/NetworkML.py                     | 4 ++--
 python/moose/neuroml/NeuroML.py                       | 6 +++---
 python/moose/recording.py                             | 4 ++--
 python/moose/utils.py                                 | 4 ++--
 python/moose/xmls_to_network/core/load_multi.py       | 2 +-
 python/moose/xmls_to_network/core/neuroml_to_moose.py | 6 +++---
 14 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/python/moose/alternate.py b/python/moose/alternate.py
index ccd4f93..a7508b4 100644
--- a/python/moose/alternate.py
+++ b/python/moose/alternate.py
@@ -284,9 +284,9 @@ from __future__ import print_function
 from functools import partial
 import warnings
 from collections import defaultdict
-import _moose
-from _moose import __version__, VERSION, SVN_REVISION, useClock, setClock, start, reinit, stop, isRunning, loadModel, getFieldDict, getField, Id, ObjId, exists, seed
-from _moose import wildcardFind as _wildcardFind # We override the original
+from . import _moose
+from ._moose import __version__, VERSION, SVN_REVISION, useClock, setClock, start, reinit, stop, isRunning, loadModel, getFieldDict, getField, Id, ObjId, exists, seed
+from ._moose import wildcardFind as _wildcardFind # We override the original
 import __main__ as main
 
 sequence_types = [ 'vector<double>',
diff --git a/python/moose/graphutil.py b/python/moose/graphutil.py
index 13216f9..50baa48 100644
--- a/python/moose/graphutil.py
+++ b/python/moose/graphutil.py
@@ -32,7 +32,7 @@ from collections import defaultdict
 import re
 import networkx as nx
 import numpy as np
-import moose 
+from . import moose
 
 def moosegraph(element, ies=['childMsg'], ied=['parentMsg'], iv=[], keep_solitary=False):
     """Create a graph out of all objects under teh element
diff --git a/python/moose/hdfutil.py b/python/moose/hdfutil.py
index b7d9ce6..dd01271 100644
--- a/python/moose/hdfutil.py
+++ b/python/moose/hdfutil.py
@@ -86,7 +86,7 @@
 
 from __future__ import print_function
 from future_builtins import zip
-import moose as moose__
+from . import moose as moose__
 import numpy as np
 import h5py as h5
 import time
diff --git a/python/moose/mtypes.py b/python/moose/mtypes.py
index 2f520ad..24064fd 100644
--- a/python/moose/mtypes.py
+++ b/python/moose/mtypes.py
@@ -47,7 +47,7 @@
 
 from __future__ import print_function
 import re
-import moose
+from . import moose
 
 ##!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 ## !! This was stolen from
diff --git a/python/moose/multiscale/parser/MorphML.py b/python/moose/multiscale/parser/MorphML.py
index e658d04..40b648b 100644
--- a/python/moose/multiscale/parser/MorphML.py
+++ b/python/moose/multiscale/parser/MorphML.py
@@ -24,7 +24,7 @@ from moose import utils as moose_utils
 from moose.neuroml import utils as neuroml_utils
 import helper.moose_methods as moose_methods
 
-from ChannelML import ChannelML
+from .ChannelML import ChannelML
 import core.config as config
 import debug.debug as debug
 import inspect
diff --git a/python/moose/multiscale/parser/NetworkML.py b/python/moose/multiscale/parser/NetworkML.py
index 9ec1562..42c6b11 100644
--- a/python/moose/multiscale/parser/NetworkML.py
+++ b/python/moose/multiscale/parser/NetworkML.py
@@ -27,8 +27,8 @@ from xml.etree import cElementTree as ET
 import string
 import os
 import sys
-import MorphML
-import ChannelML
+from . import MorphML
+from . import ChannelML
 import moose
 import moose.neuroml.utils as nmu
 import moose.utils as mu
@@ -45,7 +45,7 @@ import matplotlib.pyplot as plt
 import numpy as np
 
 from math import cos, sin
-import utils
+from . import utils
 
 class NetworkML(object):
 
diff --git a/python/moose/multiscale/parser/NeuroML.py b/python/moose/multiscale/parser/NeuroML.py
index d78cd8e..0b23cc3 100644
--- a/python/moose/multiscale/parser/NeuroML.py
+++ b/python/moose/multiscale/parser/NeuroML.py
@@ -36,9 +36,9 @@ CHANGE LOG:
 
 from xml.etree import cElementTree as ET
 import sys
-import MorphML
-import NetworkML
-import ChannelML
+from . import MorphML
+from . import NetworkML
+from . import ChannelML
 import moose
 import moose.utils
 import moose.neuroml.utils as mnu
diff --git a/python/moose/neuroml/MorphML.py b/python/moose/neuroml/MorphML.py
index 38ab865..bdf0a3d 100644
--- a/python/moose/neuroml/MorphML.py
+++ b/python/moose/neuroml/MorphML.py
@@ -22,7 +22,7 @@ from os import path
 import moose
 from moose import utils as moose_utils
 from moose.neuroml import utils as neuroml_utils
-from ChannelML import ChannelML
+from .ChannelML import ChannelML
 
 class MorphML():
 
diff --git a/python/moose/neuroml/NetworkML.py b/python/moose/neuroml/NetworkML.py
index b671d66..da1a456 100644
--- a/python/moose/neuroml/NetworkML.py
+++ b/python/moose/neuroml/NetworkML.py
@@ -16,8 +16,8 @@ from xml.etree import cElementTree as ET
 import string
 import os
 from math import cos, sin
-from MorphML import MorphML
-from ChannelML import ChannelML
+from .MorphML import MorphML
+from .ChannelML import ChannelML
 import moose
 from moose.neuroml.utils import meta_ns, nml_ns, find_first_file, tweak_model
 from moose import utils
diff --git a/python/moose/neuroml/NeuroML.py b/python/moose/neuroml/NeuroML.py
index 4594c0a..e5e4e60 100644
--- a/python/moose/neuroml/NeuroML.py
+++ b/python/moose/neuroml/NeuroML.py
@@ -25,9 +25,9 @@ from __future__ import print_function
 import moose
 from moose.utils import *
 from xml.etree import cElementTree as ET
-from ChannelML import ChannelML
-from MorphML import MorphML
-from NetworkML import NetworkML
+from .ChannelML import ChannelML
+from .MorphML import MorphML
+from .NetworkML import NetworkML
 import string
 from moose.neuroml.utils import *
 import sys
diff --git a/python/moose/recording.py b/python/moose/recording.py
index 21c60a2..e59a7b9 100644
--- a/python/moose/recording.py
+++ b/python/moose/recording.py
@@ -1,8 +1,8 @@
 from __future__ import print_function
 from future_builtins import zip
-import moose as _moose
+from . import moose as _moose
 
-from _compat import basestr
+from ._compat import basestr
 
 _tick = 8
 _base = '/_utils'
diff --git a/python/moose/utils.py b/python/moose/utils.py
index 9b1c49a..5b1cf7b 100644
--- a/python/moose/utils.py
+++ b/python/moose/utils.py
@@ -8,9 +8,9 @@ __date__ = '21 November 2012'
 
 import types, parser, token, symbol, string, os, math
 from datetime import datetime
-import _moose
+from . import _moose
 
-from _compat import basestring
+from ._compat import basestring
 
 ## for Ca Pool
 #FARADAY = 96154.0 # Coulombs # from cadecay.mod : 1/(2*96154.0) = 5.2e-6 which is the Book of Genesis / readcell value
diff --git a/python/moose/xmls_to_network/core/load_multi.py b/python/moose/xmls_to_network/core/load_multi.py
index ec3db24..6a197b2 100644
--- a/python/moose/xmls_to_network/core/load_multi.py
+++ b/python/moose/xmls_to_network/core/load_multi.py
@@ -23,7 +23,7 @@ import os
 os.environ['NUMPTHREADS'] = '1'
 import signal
 import math
-import proto
+from . import proto
 import parser.importer 
 import debug.debug as debug
 
diff --git a/python/moose/xmls_to_network/core/neuroml_to_moose.py b/python/moose/xmls_to_network/core/neuroml_to_moose.py
index fc013b9..fd13b49 100644
--- a/python/moose/xmls_to_network/core/neuroml_to_moose.py
+++ b/python/moose/xmls_to_network/core/neuroml_to_moose.py
@@ -56,9 +56,9 @@ from __future__ import print_function
 from future_builtins import zip, map
 import sys, os
 import numpy as np
-import neuroml2_parser as nml
-from units import SI
-import hhfit
+from . import neuroml2_parser as nml
+from .units import SI
+from . import hhfit
 import logging
 import debug.debug as debug
 from IPython import embed
-- 
1.8.5.3