Updating the six import to use salt version of six. Reverting a change in the adb beacon that broke tests.

salt/beacons/adb.py

@@ -56,7 +56,7 @@ def validate(config):
                 log.info('Need a one of the following adb '
                          'states: %s', ', '.join(states))
                 return False, ('Need a one of the following adb '
-                               'states: %s', ', '.join(states))
+                               'states: {0}'.format(', '.join(states)))
     return True, 'Valid beacon configuration'
 
 

salt/beacons/avahi_announce.py

@@ -14,8 +14,9 @@ Dependencies
 # Import Python libs
 from __future__ import absolute_import, unicode_literals
 import logging
-import six
 import time
+
+from salt.ext import six
 from salt.ext.six.moves import map
 
 # Import 3rd Party libs

salt/beacons/bonjour_announce.py

@@ -8,8 +8,9 @@ from __future__ import absolute_import
 import atexit
 import logging
 import select
-import six
 import time
+
+from salt.ext import six
 from salt.ext.six.moves import map
 
 # Import 3rd Party libs

salt/beacons/sensehat.py

@@ -14,8 +14,8 @@ from __future__ import absolute_import, unicode_literals
 
 import logging
 import re
-import six
 
+from salt.ext import six
 from salt.ext.six.moves import map
 
 log = logging.getLogger(__name__)

salt/beacons/twilio_txt_msg.py

@@ -7,8 +7,8 @@ Beacon to emit Twilio text messages
 from __future__ import absolute_import, unicode_literals
 
 import logging
-import six
 
+from salt.ext import six
 from salt.ext.six.moves import map
 
 # Import 3rd Party libs