From dbe60d1ab11cae9ed38c336ed6adb1eab9c5dce0 Mon Sep 17 00:00:00 2001
From: Julien Cigar <jcigar@ulb.ac.be>
Date: Wed, 30 Sep 2015 17:16:50 +0200
Subject: [PATCH] import ipaddress from _compat module

---
 salt/utils/network.py | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/salt/utils/network.py b/salt/utils/network.py
index dca56f85e3..3179fd32ff 100644
--- a/salt/utils/network.py
+++ b/salt/utils/network.py
@@ -14,10 +14,6 @@ from string import ascii_letters, digits
 
 # Import 3rd-party libs
 import salt.ext.six as six
-if six.PY3:
-    import ipaddress
-else:
-    import salt.ext.ipaddress as ipaddress
 from salt.ext.six.moves import range  # pylint: disable=import-error,redefined-builtin
 # Attempt to import wmi
 try:
@@ -28,7 +24,7 @@ except ImportError:
 
 # Import salt libs
 import salt.utils
-from salt._compat import subprocess
+from salt._compat import subprocess, ipaddress
 
 log = logging.getLogger(__name__)