1 Upstream patch fixed in Icehouse-1

     2 

     3 The following upstream patch was cherrypicked out of the following

     4 commit and is required for a subsequent patch to apply cleanly.

     5 

     6 commit 0f6f386c74754bc2e94a177d00d74bc074eba2fd

     7 Author: Dolph Mathews <[email protected]>

     8 Date:   Thu May 23 15:09:14 2013 -0500

     9 

    10     import only modules (flake8 H302)

    11     

    12     Change-Id: I0fa6fc6bf9d51b60fa987a0040168f3f0ef78a4a

    13 

    14 diff --git a/keystone/middleware/ec2_token.py b/keystone/middleware/ec2_token.py

    15 index daac10a..7cd007c 100644

    16 --- a/keystone/middleware/ec2_token.py

    17 +++ b/keystone/middleware/ec2_token.py

    18 @@ -22,7 +22,7 @@ Starting point for routing EC2 requests.

    19  

    20  """

    21  

    22 -from urlparse import urlparse

    23 +import urlparse

    24  

    25  from eventlet.green import httplib

    26  import webob.dec

    27 @@ -73,7 +73,7 @@ class EC2Token(wsgi.Middleware):

    28          # Disable 'has no x member' pylint error

    29          # for httplib and urlparse

    30          # pylint: disable-msg=E1101

    31 -        o = urlparse(FLAGS.keystone_ec2_url)

    32 +        o = urlparse.urlparse(FLAGS.keystone_ec2_url)

    33          if o.scheme == 'http':

    34              conn = httplib.HTTPConnection(o.netloc)

    35          else: