kibana checks: use six.moves instead of ImportError

2 files changed, 11 insertions, 14 deletions

diff --git a/roles/openshift_health_checker/openshift_checks/logging/kibana.py b/roles/openshift_health_checker/openshift_checks/logging/kibana.py
index 3b1cf8baa..16ec3a7f6 100644
--- a/roles/openshift_health_checker/openshift_checks/logging/kibana.py
+++ b/roles/openshift_health_checker/openshift_checks/logging/kibana.py
@@ -5,12 +5,11 @@ Module for performing checks on a Kibana logging deployment
 import json
 import ssl
 
-try:
-    from urllib2 import HTTPError, URLError
-    import urllib2
-except ImportError:
-    from urllib.error import HTTPError, URLError
-    import urllib.request as urllib2
+# pylint can't find the package when its installed in virtualenv
+# pylint: disable=import-error,no-name-in-module
+from ansible.module_utils.six.moves.urllib import request
+# pylint: disable=import-error,no-name-in-module
+from ansible.module_utils.six.moves.urllib.error import HTTPError, URLError
 
 from openshift_checks.logging.logging import LoggingCheck, OpenShiftCheckException
 
@@ -65,7 +64,7 @@ class Kibana(LoggingCheck):
         # Verify that the url is returning a valid response
         try:
             # We only care if the url connects and responds
-            return_code = urllib2.urlopen(url, context=ctx).getcode()
+            return_code = request.urlopen(url, context=ctx).getcode()
         except HTTPError as httperr:
             return httperr.reason
         except URLError as urlerr:
diff --git a/roles/openshift_health_checker/test/kibana_test.py b/roles/openshift_health_checker/test/kibana_test.py
index 04a5e89c4..750d4b9e9 100644
--- a/roles/openshift_health_checker/test/kibana_test.py
+++ b/roles/openshift_health_checker/test/kibana_test.py
@@ -1,12 +1,10 @@
 import pytest
 import json
 
-try:
-    import urllib2
-    from urllib2 import HTTPError, URLError
-except ImportError:
-    from urllib.error import HTTPError, URLError
-    import urllib.request as urllib2
+# pylint can't find the package when its installed in virtualenv
+from ansible.module_utils.six.moves.urllib import request  # pylint: disable=import-error
+# pylint: disable=import-error
+from ansible.module_utils.six.moves.urllib.error import HTTPError, URLError
 
 from openshift_checks.logging.kibana import Kibana, OpenShiftCheckException
 
@@ -202,7 +200,7 @@ def test_verify_url_external_failure(lib_result, expect, monkeypatch):
         if type(lib_result) is int:
             return _http_return(lib_result)
         raise lib_result
-    monkeypatch.setattr(urllib2, 'urlopen', urlopen)
+    monkeypatch.setattr(request, 'urlopen', urlopen)
 
     check = Kibana()
     check._get_kibana_url = lambda: 'url'