DCD-386: Use the six module to paper over Python changes.

bin/run-all-tests

@@ -5,7 +5,7 @@ set -e
 # Use Ansible from virtualenv if provided
 if [[ -f .venv/bin/ansible ]]; then
     source .venv/bin/activate
-    pip install molecule docker
+    pip install molecule docker six
 fi
 
 for role in `find roles/ -name molecule`; do

roles/product_install/molecule/bitbucket_latest/tests/test_default.py

@@ -1,5 +1,5 @@
 import os
-import urllib.request
+from six.moves import urllib
 import json
 
 import testinfra.utils.ansible_runner

roles/product_install/molecule/confluence_latest/tests/test_default.py

@@ -1,5 +1,5 @@
 import os
-import urllib.request
+from six.moves import urllib
 import json
 
 import testinfra.utils.ansible_runner

roles/product_install/molecule/default/tests/test_default.py

@@ -1,5 +1,5 @@
 import os
-import urllib.request
+from six.moves import urllib
 
 import testinfra.utils.ansible_runner
 

roles/product_install/molecule/jira_cached_with_downgrade/tests/test_default.py

@@ -1,5 +1,5 @@
 import os
-import urllib.request
+from six.moves import urllib
 
 import testinfra.utils.ansible_runner
 

roles/product_install/molecule/jira_cached_with_upgrade/tests/test_default.py

@@ -1,5 +1,5 @@
 import os
-import urllib.request
+from six.moves import urllib
 
 import testinfra.utils.ansible_runner
 

roles/product_install/molecule/jira_software_latest/tests/test_default.py

@@ -1,5 +1,5 @@
 import os
-import urllib.request
+from six.moves import urllib
 
 import testinfra.utils.ansible_runner
 

roles/product_install/molecule/jira_version_from_file/tests/test_default.py

@@ -1,5 +1,5 @@
 import os
-import urllib.request
+from six.moves import urllib
 
 import testinfra.utils.ansible_runner
 

roles/product_install/molecule/jira_version_latest/tests/test_default.py

@@ -1,5 +1,5 @@
 import os
-import urllib.request
+from six.moves import urllib
 
 import testinfra.utils.ansible_runner
 

roles/product_install/molecule/jira_version_override/tests/test_default.py

@@ -1,5 +1,5 @@
 import os
-import urllib.request
+from six.moves import urllib
 
 import testinfra.utils.ansible_runner
 

roles/product_install/molecule/resources/tests/test_common.py

@@ -1,5 +1,5 @@
 import os
-import urllib.request
+from six.moves import urllib
 
 import testinfra.utils.ansible_runner
 

roles/product_install/molecule/servicedesk3/tests/test_default.py

@@ -1,5 +1,5 @@
 import os
-import urllib.request
+from six.moves import urllib
 
 import testinfra.utils.ansible_runner
 

roles/product_install/molecule/servicedesk4/tests/test_default.py

@@ -1,5 +1,5 @@
 import os
-import urllib.request
+from six.moves import urllib
 
 import testinfra.utils.ansible_runner
 

roles/product_install/molecule/servicedesk_latest/tests/test_default.py

@@ -1,6 +1,6 @@
 import os
 import json
-import urllib.request
+from six.moves import urllib
 
 import testinfra.utils.ansible_runner