python3 compat fixes

Author: cognifloyd

st2auth_keystone_backend/__init__.py

@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from keystone import KeystoneAuthenticationBackend
+from .keystone import KeystoneAuthenticationBackend
 
 __all__ = [
     'KeystoneAuthenticationBackend'

st2auth_keystone_backend/keystone.py

@@ -14,7 +14,7 @@
 # limitations under the License.
 
 import logging
-import httplib
+import http.client
 
 import requests
 
@@ -65,7 +65,7 @@ def authenticate(self, username, password):
             LOG.debug('Authentication for user "{}" failed: {}'.format(username, str(e)))
             return False
 
-        if login.status_code in [httplib.OK, httplib.CREATED]:
+        if login.status_code in [http.client.OK, http.client.CREATED]:
             LOG.debug('Authentication for user "{}" successful'.format(username))
             return True
         else:

tests/unit/test_keystone_backend.py

@@ -14,7 +14,7 @@
 # limitations under the License.
 
 import sys
-import httplib
+import http.client
 
 import unittest
 import mock
@@ -26,9 +26,9 @@
 class KeystoneAuthenticationBackendTestCase(unittest.TestCase):
     def _mock_keystone(self, *args, **kwargs):
         return_codes = {
-            'goodv2': httplib.OK,
-            'goodv3': httplib.CREATED,
-            'bad': httplib.UNAUTHORIZED
+            'goodv2': http.client.OK,
+            'goodv3': http.client.CREATED,
+            'bad': http.client.UNAUTHORIZED
         }
         json = kwargs.get('json')
         res = Response()