Merge "Revert environment module usage in middleware."

keystone/middleware/ec2_token.py

@@ -24,14 +24,14 @@
 
 import urlparse
 
+from eventlet.green import httplib
 import webob.dec
 import webob.exc
 
 from nova import flags
 from nova import utils
 from nova import wsgi
 
-from keystone.common import environment
 
 FLAGS = flags.FLAGS
 flags.DEFINE_string('keystone_ec2_url',
@@ -75,9 +75,9 @@ def __call__(self, req):
         # pylint: disable-msg=E1101
         o = urlparse.urlparse(FLAGS.keystone_ec2_url)
         if o.scheme == 'http':
-            conn = environment.httplib.HTTPConnection(o.netloc)
+            conn = httplib.HTTPConnection(o.netloc)
         else:
-            conn = environment.httplib.HTTPSConnection(o.netloc)
+            conn = httplib.HTTPSConnection(o.netloc)
         conn.request('POST', o.path, body=creds_json, headers=headers)
         response = conn.getresponse().read()
         conn.close()

keystone/middleware/s3_token.py

@@ -33,11 +33,11 @@
 
 """
 
+import httplib
 import webob
 
 from swift.common import utils as swift_utils
 
-from keystone.common import environment
 from keystone.openstack.common import jsonutils
 
 
@@ -62,9 +62,9 @@ def __init__(self, app, conf):
         self.auth_port = int(conf.get('auth_port', 35357))
         self.auth_protocol = conf.get('auth_protocol', 'https')
         if self.auth_protocol == 'http':
-            self.http_client_class = environment.httplib.HTTPConnection
+            self.http_client_class = httplib.HTTPConnection
         else:
-            self.http_client_class = environment.httplib.HTTPSConnection
+            self.http_client_class = httplib.HTTPSConnection
         # SSL
         self.cert_file = conf.get('certfile')
         self.key_file = conf.get('keyfile')