Move salt.utils.ipaddr to salt.ext.ipaddr

ghoz · Nov 19, 2014 · 4c68c32 · 4c68c32
1 parent ffbc38a
commit 4c68c32
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/COPYING b/COPYING
@@ -67,7 +67,7 @@ License: MIT License
   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
   THE SOFTWARE.
 
-Files: salt/utils/ipaddr.py
+Files: salt/ext/ipaddr.py
 Copyright: 2007 Google Inc.
 License: Apache-2.0
  Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/salt/utils/ipaddr.py → salt/ext/ipaddr.py b/salt/utils/ipaddr.py → salt/ext/ipaddr.py
diff --git a/salt/roster/scan.py b/salt/roster/scan.py
@@ -8,7 +8,7 @@
 import socket
 
 # Import salt libs
-import salt.utils.ipaddr
+import salt.ext.ipaddr
 
 
 def targets(tgt, tgt_type='glob', **kwargs):
@@ -36,11 +36,11 @@ def targets(self):
         addrs = ()
         ret = {}
         try:
-            salt.utils.ipaddr.IPAddress(self.tgt)
+            salt.ext.ipaddr.IPAddress(self.tgt)
             addrs = [self.tgt]
         except ValueError:
             try:
-                addrs = salt.utils.ipaddr.IPNetwork(self.tgt).iterhosts()
+                addrs = salt.ext.ipaddr.IPNetwork(self.tgt).iterhosts()
             except ValueError:
                 pass
         for addr in addrs: