Make tests pass Signed-off-by: Tomaz Muraus <[email protected]>
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/bf5e60e3 Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/bf5e60e3 Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/bf5e60e3 Branch: refs/heads/trunk Commit: bf5e60e38de2496a5b447cf30d66f6e8e5413e46 Parents: 65579bf Author: Gertjan Oude Lohuis <[email protected]> Authored: Wed Mar 4 15:11:59 2015 +0100 Committer: Tomaz Muraus <[email protected]> Committed: Fri Mar 6 15:58:12 2015 +0100 ---------------------------------------------------------------------- libcloud/common/aws.py | 2 +- libcloud/compute/drivers/ec2.py | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/libcloud/blob/bf5e60e3/libcloud/common/aws.py ---------------------------------------------------------------------- diff --git a/libcloud/common/aws.py b/libcloud/common/aws.py index 823f5cd..4bee406 100644 --- a/libcloud/common/aws.py +++ b/libcloud/common/aws.py @@ -204,7 +204,7 @@ class V4SignedAWSConnection(AWSTokenConnection): signed_headers = ';'.join([k.lower() for k in sorted(headers.keys())]) # For self.method == GET - request_params = '&'.join(["%s=%s" % (urlquote(k, safe=''), urlquote(v, safe='-_~')) + request_params = '&'.join(["%s=%s" % (urlquote(str(k), safe=''), urlquote(str(v), safe='-_~')) for k, v in sorted(params.items())]) payload_hash = hashlib.sha256('').hexdigest() http://git-wip-us.apache.org/repos/asf/libcloud/blob/bf5e60e3/libcloud/compute/drivers/ec2.py ---------------------------------------------------------------------- diff --git a/libcloud/compute/drivers/ec2.py b/libcloud/compute/drivers/ec2.py index 4401da4..092f587 100644 --- a/libcloud/compute/drivers/ec2.py +++ b/libcloud/compute/drivers/ec2.py @@ -5533,7 +5533,7 @@ class EC2NodeDriver(BaseEC2NodeDriver): Amazon EC2 node driver. """ - connectionCls = EC2V4Connection + connectionCls = EC2Connection type = Provider.EC2 name = 'Amazon EC2' website = 'http://aws.amazon.com/ec2/' @@ -5581,8 +5581,6 @@ class EC2EUNodeDriver(EC2NodeDriver): """ Driver class for EC2 in the Western Europe Region. """ - - connectionCls = EC2Connection name = 'Amazon EC2 (eu-west-1)' _region = 'eu-west-1' @@ -5591,7 +5589,6 @@ class EC2EUCentralNodeDriver(EC2NodeDriver): """ Driver class for EC2 in the Central Europe Region. """ - connectionCls = EC2V4Connection name = 'Amazon EC2 (eu-central-1)' _region = 'eu-central-1'
