Changed reference to reflect refactor of ioflo package locations as of ioflo 1.2.3

Deprecated package locations still supported in ioflo for now

salt/daemons/flo/core.py

@@ -30,7 +30,7 @@ from salt.utils import kinds, is_windows
 from salt.utils.event import tagify
 
 # Import ioflo libs
-from ioflo.base.odicting import odict
+from ioflo.aid.odicting import odict
 import ioflo.base.deeding
 
 from ioflo.base.consoling import getConsole

salt/daemons/salting.py

@@ -11,7 +11,7 @@ from __future__ import absolute_import
 import os
 
 # Import ioflo libs
-from ioflo.base.odicting import odict
+from ioflo.aid.odicting import odict
 
 from ioflo.base.consoling import getConsole
 console = getConsole()

salt/daemons/test/plan/actors.py

@@ -12,7 +12,7 @@ from collections import deque
 
 # Import ioflo libs
 import ioflo.base.deeding
-from ioflo.base.odicting import odict
+from ioflo.aid.odicting import odict
 
 from ioflo.base.consoling import getConsole
 console = getConsole()

salt/daemons/test/test_master.py

@@ -12,7 +12,7 @@ from __future__ import absolute_import
 import os
 import stat
 
-from ioflo.base.odicting import odict
+from ioflo.aid.odicting import odict
 from ioflo.base.consoling import getConsole
 console = getConsole()
 

salt/daemons/test/test_minion.py

@@ -11,7 +11,7 @@ from __future__ import print_function
 import os
 import stat
 
-from ioflo.base.odicting import odict
+from ioflo.aid.odicting import odict
 from ioflo.base.consoling import getConsole
 console = getConsole()
 

salt/daemons/test/test_multimaster.py

@@ -19,7 +19,7 @@ import time
 import tempfile
 import shutil
 
-from ioflo.base.odicting import odict
+from ioflo.aid.odicting import odict
 from ioflo.base.aiding import Timer, StoreTimer
 from ioflo.base import storing
 from ioflo.base.consoling import getConsole

salt/daemons/test/test_presence.py

@@ -13,7 +13,7 @@ else:
 
 from ioflo.base.consoling import getConsole
 console = getConsole()
-from ioflo.base.odicting import odict
+from ioflo.aid.odicting import odict
 from ioflo.test import testing
 
 from raet.lane.stacking import LaneStack

salt/daemons/test/test_raetkey.py

@@ -19,7 +19,7 @@ import time
 import tempfile
 import shutil
 
-from ioflo.base.odicting import odict
+from ioflo.aid.odicting import odict
 from ioflo.base.aiding import Timer, StoreTimer
 from ioflo.base import storing
 from ioflo.base.consoling import getConsole

salt/daemons/test/test_saltkeep.py

@@ -21,7 +21,7 @@ import time
 import tempfile
 import shutil
 
-from ioflo.base.odicting import odict
+from ioflo.aid.odicting import odict
 from ioflo.base.aiding import Timer, StoreTimer
 from ioflo.base import storing
 from ioflo.base.consoling import getConsole

salt/daemons/test/test_stats.py

@@ -14,7 +14,7 @@ import time
 
 from ioflo.base.consoling import getConsole
 console = getConsole()
-from ioflo.base.odicting import odict
+from ioflo.aid.odicting import odict
 from ioflo.test import testing
 
 from raet.abiding import ns2u

salt/utils/yamldumper.py

@@ -18,7 +18,7 @@ except ImportError:
 from salt.utils.odict import OrderedDict
 
 try:
-    from ioflo.base.odicting import odict
+    from ioflo.aid.odicting import odict
     HAS_IOFLO = True
 except ImportError:
     odict = None