#!/bin/sh

# Do we want to check dynamic inventory, bin, etc?
BASEDIR=${1-"lib"}
# REGEX of individual files where the import of six is not a problem
# digital_ocean is checking for six because dopy doesn't specify the
#   requirement on six so it needs to try importing six to give the correct error
#   message
WHITELIST='(lib/ansible/modules/core/cloud/digital_ocean/digital_ocean.py)'

SIX_USERS=$(find "$BASEDIR" -name '*.py' -exec grep -wH six \{\} \;|grep import |grep -v ansible.compat| grep -v ansible.module_utils.six| egrep -v "^$WHITELIST:")
if test -n "$SIX_USERS" ; then
  printf "$SIX_USERS"
  exit 1
else
  exit 0
fi

#!/bin/sh

# Do we want to check dynamic inventory, bin, etc?
BASEDIR=${1-"lib"}

SIX_USERS=$(find "$BASEDIR" -name '*.py' -exec grep -wH six \{\} \;|grep import |grep -v ansible.compat| grep -v ansible.module_utils.six)
if test -n "$SIX_USERS" ; then
  printf "$SIX_USERS"
  exit 1
else
  exit 0
fi

--- 
+++ 
@@ -2,13 +2,8 @@
 
 # Do we want to check dynamic inventory, bin, etc?
 BASEDIR=${1-"lib"}
-# REGEX of individual files where the import of six is not a problem
-# digital_ocean is checking for six because dopy doesn't specify the
-#   requirement on six so it needs to try importing six to give the correct error
-#   message
-WHITELIST='(lib/ansible/modules/core/cloud/digital_ocean/digital_ocean.py)'
 
-SIX_USERS=$(find "$BASEDIR" -name '*.py' -exec grep -wH six \{\} \;|grep import |grep -v ansible.compat| grep -v ansible.module_utils.six| egrep -v "^$WHITELIST:")
+SIX_USERS=$(find "$BASEDIR" -name '*.py' -exec grep -wH six \{\} \;|grep import |grep -v ansible.compat| grep -v ansible.module_utils.six)
 if test -n "$SIX_USERS" ; then
   printf "$SIX_USERS"
   exit 1
Add a whitelist for checking for six.  Use it for digital_ocean.py
