Merge pull request #2399 from felixonmars/vpc-py3

vpc module: add backward-compatible support for Python 3.3+. Fixes #2399.

Author: danielgtaylor

README.rst

@@ -76,7 +76,7 @@ At the moment, boto supports:
 * Networking
 
   * Amazon Route53 (Python 3)
-  * Amazon Virtual Private Cloud (VPC)
+  * Amazon Virtual Private Cloud (VPC) (Python 3)
   * Elastic Load Balancing (ELB) (Python 3)
   * AWS Direct Connect (Python 3)
 

boto/ec2/connection.py

@@ -122,6 +122,9 @@ def get_params(self):
         return params
 
     def build_filter_params(self, params, filters):
+        if not isinstance(filters, dict):
+            filters = dict(filters)
+
         i = 1
         for name in filters:
             aws_name = name

boto/vpc/__init__.py

@@ -85,9 +85,9 @@ def get_all_vpcs(self, vpc_ids=None, filters=None, dry_run=False):
         :type vpc_ids: list
         :param vpc_ids: A list of strings with the desired VPC ID's
 
-        :type filters: list of tuples
-        :param filters: A list of tuples containing filters.  Each tuple
-            consists of a filter key and a filter value.
+        :type filters: list of tuples or dict
+        :param filters: A list of tuples or dict containing filters.  Each tuple
+            or dict item consists of a filter key and a filter value.
             Possible filter keys are:
 
             * *state* - a list of states of the VPC (pending or available)
@@ -104,7 +104,7 @@ def get_all_vpcs(self, vpc_ids=None, filters=None, dry_run=False):
         if vpc_ids:
             self.build_list_params(params, vpc_ids, 'VpcId')
         if filters:
-            self.build_filter_params(params, dict(filters))
+            self.build_filter_params(params, filters)
         if dry_run:
             params['DryRun'] = 'true'
         return self.get_list('DescribeVpcs', params, [('item', VPC)])
@@ -204,9 +204,9 @@ def get_all_route_tables(self, route_table_ids=None, filters=None,
         :param route_table_ids: A list of strings with the desired route table
                                 IDs.
 
-        :type filters: list of tuples
-        :param filters: A list of tuples containing filters. Each tuple
-                        consists of a filter key and a filter value.
+        :type filters: list of tuples or dict
+        :param filters: A list of tuples or dict containing filters. Each tuple
+                        or dict item consists of a filter key and a filter value.
 
         :type dry_run: bool
         :param dry_run: Set to True if the operation should not actually run.
@@ -218,7 +218,7 @@ def get_all_route_tables(self, route_table_ids=None, filters=None,
         if route_table_ids:
             self.build_list_params(params, route_table_ids, "RouteTableId")
         if filters:
-            self.build_filter_params(params, dict(filters))
+            self.build_filter_params(params, filters)
         if dry_run:
             params['DryRun'] = 'true'
         return self.get_list('DescribeRouteTables', params,
@@ -516,9 +516,9 @@ def get_all_network_acls(self, network_acl_ids=None, filters=None):
         :param network_acl_ids: A list of strings with the desired network ACL
                                 IDs.
 
-        :type filters: list of tuples
-        :param filters: A list of tuples containing filters. Each tuple
-                        consists of a filter key and a filter value.
+        :type filters: list of tuples or dict
+        :param filters: A list of tuples or dict containing filters. Each tuple
+                        or dict item consists of a filter key and a filter value.
 
         :rtype: list
         :return: A list of :class:`boto.vpc.networkacl.NetworkAcl`
@@ -527,7 +527,7 @@ def get_all_network_acls(self, network_acl_ids=None, filters=None):
         if network_acl_ids:
             self.build_list_params(params, network_acl_ids, "NetworkAclId")
         if filters:
-            self.build_filter_params(params, dict(filters))
+            self.build_filter_params(params, filters)
         return self.get_list('DescribeNetworkAcls', params,
                              [('item', NetworkAcl)])
 
@@ -779,9 +779,9 @@ def get_all_internet_gateways(self, internet_gateway_ids=None,
         :type internet_gateway_ids: list
         :param internet_gateway_ids: A list of strings with the desired gateway IDs.
 
-        :type filters: list of tuples
-        :param filters: A list of tuples containing filters.  Each tuple
-                        consists of a filter key and a filter value.
+        :type filters: list of tuples or dict
+        :param filters: A list of tuples or dict containing filters.  Each tuple
+                        or dict item consists of a filter key and a filter value.
 
         :type dry_run: bool
         :param dry_run: Set to True if the operation should not actually run.
@@ -793,7 +793,7 @@ def get_all_internet_gateways(self, internet_gateway_ids=None,
             self.build_list_params(params, internet_gateway_ids,
                                    'InternetGatewayId')
         if filters:
-            self.build_filter_params(params, dict(filters))
+            self.build_filter_params(params, filters)
         if dry_run:
             params['DryRun'] = 'true'
         return self.get_list('DescribeInternetGateways', params,
@@ -896,9 +896,9 @@ def get_all_customer_gateways(self, customer_gateway_ids=None,
         :param customer_gateway_ids: A list of strings with the desired
             CustomerGateway ID's.
 
-        :type filters: list of tuples
-        :param filters: A list of tuples containing filters.  Each tuple
-                        consists of a filter key and a filter value.
+        :type filters: list of tuples or dict
+        :param filters: A list of tuples or dict containing filters.  Each tuple
+                        or dict item consists of a filter key and a filter value.
                         Possible filter keys are:
 
                          - *state*, the state of the CustomerGateway
@@ -918,7 +918,7 @@ def get_all_customer_gateways(self, customer_gateway_ids=None,
             self.build_list_params(params, customer_gateway_ids,
                                    'CustomerGatewayId')
         if filters:
-            self.build_filter_params(params, dict(filters))
+            self.build_filter_params(params, filters)
 
         if dry_run:
             params['DryRun'] = 'true'
@@ -985,9 +985,9 @@ def get_all_vpn_gateways(self, vpn_gateway_ids=None, filters=None,
         :type vpn_gateway_ids: list
         :param vpn_gateway_ids: A list of strings with the desired VpnGateway ID's
 
-        :type filters: list of tuples
-        :param filters: A list of tuples containing filters.  Each tuple
-                        consists of a filter key and a filter value.
+        :type filters: list of tuples or dict
+        :param filters: A list of tuples or dict containing filters.  Each tuple
+                        or dict item consists of a filter key and a filter value.
                         Possible filter keys are:
 
                         - *state*, a list of states of the VpnGateway
@@ -1006,7 +1006,7 @@ def get_all_vpn_gateways(self, vpn_gateway_ids=None, filters=None,
         if vpn_gateway_ids:
             self.build_list_params(params, vpn_gateway_ids, 'VpnGatewayId')
         if filters:
-            self.build_filter_params(params, dict(filters))
+            self.build_filter_params(params, filters)
         if dry_run:
             params['DryRun'] = 'true'
         return self.get_list('DescribeVpnGateways', params,
@@ -1109,9 +1109,9 @@ def get_all_subnets(self, subnet_ids=None, filters=None, dry_run=False):
         :type subnet_ids: list
         :param subnet_ids: A list of strings with the desired Subnet ID's
 
-        :type filters: list of tuples
-        :param filters: A list of tuples containing filters.  Each tuple
-                        consists of a filter key and a filter value.
+        :type filters: list of tuples or dict
+        :param filters: A list of tuples or dict containing filters.  Each tuple
+                        or dict item consists of a filter key and a filter value.
                         Possible filter keys are:
 
                         - *state*, a list of states of the Subnet
@@ -1132,7 +1132,7 @@ def get_all_subnets(self, subnet_ids=None, filters=None, dry_run=False):
         if subnet_ids:
             self.build_list_params(params, subnet_ids, 'SubnetId')
         if filters:
-            self.build_filter_params(params, dict(filters))
+            self.build_filter_params(params, filters)
         if dry_run:
             params['DryRun'] = 'true'
         return self.get_list('DescribeSubnets', params, [('item', Subnet)])
@@ -1192,9 +1192,9 @@ def get_all_dhcp_options(self, dhcp_options_ids=None, filters=None, dry_run=Fals
         :type dhcp_options_ids: list
         :param dhcp_options_ids: A list of strings with the desired DhcpOption ID's
 
-        :type filters: list of tuples
-        :param filters: A list of tuples containing filters.  Each tuple
-            consists of a filter key and a filter value.
+        :type filters: list of tuples or dict
+        :param filters: A list of tuples or dict containing filters.  Each tuple
+            or dict item consists of a filter key and a filter value.
 
         :type dry_run: bool
         :param dry_run: Set to True if the operation should not actually run.
@@ -1206,7 +1206,7 @@ def get_all_dhcp_options(self, dhcp_options_ids=None, filters=None, dry_run=Fals
         if dhcp_options_ids:
             self.build_list_params(params, dhcp_options_ids, 'DhcpOptionsId')
         if filters:
-            self.build_filter_params(params, dict(filters))
+            self.build_filter_params(params, filters)
         if dry_run:
             params['DryRun'] = 'true'
         return self.get_list('DescribeDhcpOptions', params,
@@ -1339,9 +1339,9 @@ def get_all_vpn_connections(self, vpn_connection_ids=None, filters=None,
         :type vpn_connection_ids: list
         :param vpn_connection_ids: A list of strings with the desired VPN_CONNECTION ID's
 
-        :type filters: list of tuples
-        :param filters: A list of tuples containing filters.  Each tuple
-                        consists of a filter key and a filter value.
+        :type filters: list of tuples or dict
+        :param filters: A list of tuples or dict containing filters.  Each tuple
+                        or dict item consists of a filter key and a filter value.
                         Possible filter keys are:
 
                         - *state*, a list of states of the VPN_CONNECTION
@@ -1363,7 +1363,7 @@ def get_all_vpn_connections(self, vpn_connection_ids=None, filters=None,
             self.build_list_params(params, vpn_connection_ids,
                                    'VpnConnectionId')
         if filters:
-            self.build_filter_params(params, dict(filters))
+            self.build_filter_params(params, filters)
         if dry_run:
             params['DryRun'] = 'true'
         return self.get_list('DescribeVpnConnections', params,

docs/source/index.rst

@@ -82,7 +82,7 @@ Currently Supported Services
 * **Networking**
 
   * :doc:`Route 53 <route53_tut>` -- (:doc:`API Reference <ref/route53>`) (Python 3)
-  * :doc:`Virtual Private Cloud (VPC) <vpc_tut>` -- (:doc:`API Reference <ref/vpc>`)
+  * :doc:`Virtual Private Cloud (VPC) <vpc_tut>` -- (:doc:`API Reference <ref/vpc>`) (Python 3)
   * :doc:`Elastic Load Balancing (ELB) <elb_tut>` -- (:doc:`API Reference <ref/elb>`) (Python 3)
   * AWS Direct Connect (Python 3)
 

tests/integration/ec2/vpc/test_connection.py

@@ -20,10 +20,10 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 # IN THE SOFTWARE.
 #
-import unittest
 import time
 
 import boto
+from boto.compat import unittest, six
 from boto.ec2.networkinterface import NetworkInterfaceCollection
 from boto.ec2.networkinterface import NetworkInterfaceSpecification
 from boto.ec2.networkinterface import PrivateIPAddress
@@ -37,7 +37,7 @@ def setUp(self):
         # Registry for cleaning up the vpc after all instances are terminated
         # in the format [ ( func, (arg1, ... argn) ) ]
         self.post_terminate_cleanups = []
-        
+
         self.api = boto.connect_vpc()
         self.vpc = self.api.create_vpc('10.0.0.0/16')
 
@@ -71,7 +71,7 @@ def terminate_instances(self):
 
     def terminate_instance(self, instance):
         instance.terminate()
-        for i in xrange(300):
+        for i in six.moves.range(300):
             instance.update()
             if instance.state == 'terminated':
                 # Give it a litle more time to settle.

tests/test.py

@@ -62,6 +62,7 @@
     'tests/unit/sts',
     'tests/unit/swf',
     'tests/unit/utils',
+    'tests/unit/vpc',
     'tests/unit/test_connection.py',
     'tests/unit/test_exception.py',
     'tests/unit/test_regioninfo.py',

tests/unit/vpc/test_customergateway.py

@@ -2,14 +2,15 @@
 from tests.unit import AWSMockServiceTestCase
 
 from boto.vpc import VPCConnection, CustomerGateway
+from boto.compat import OrderedDict
 
 
 class TestDescribeCustomerGateways(AWSMockServiceTestCase):
 
     connection_class = VPCConnection
 
     def default_body(self):
-        return """
+        return b"""
             <DescribeCustomerGatewaysResponse xmlns="http://ec2.amazonaws.com/doc/2013-10-01/">
               <requestId>7a62c49f-347e-4fc4-9331-6e8eEXAMPLE</requestId>
               <customerGatewaySet>
@@ -29,8 +30,8 @@ def test_get_all_customer_gateways(self):
         self.set_http_response(status_code=200)
         api_response = self.service_connection.get_all_customer_gateways(
             'cgw-b4dc3961',
-            filters=[('state', ['pending', 'available']),
-                     ('ip-address', '12.1.2.3')])
+            filters=OrderedDict([('state', ['pending', 'available']),
+                     ('ip-address', '12.1.2.3')]))
         self.assert_request_parameters({
             'Action': 'DescribeCustomerGateways',
             'CustomerGatewayId.1': 'cgw-b4dc3961',
@@ -52,7 +53,7 @@ class TestCreateCustomerGateway(AWSMockServiceTestCase):
     connection_class = VPCConnection
 
     def default_body(self):
-        return """
+        return b"""
             <CreateCustomerGatewayResponse xmlns="http://ec2.amazonaws.com/doc/2013-10-01/">
                <requestId>7a62c49f-347e-4fc4-9331-6e8eEXAMPLE</requestId>
                <customerGateway>
@@ -91,7 +92,7 @@ class TestDeleteCustomerGateway(AWSMockServiceTestCase):
     connection_class = VPCConnection
 
     def default_body(self):
-        return """
+        return b"""
             <DeleteCustomerGatewayResponse xmlns="http://ec2.amazonaws.com/doc/2013-10-01/">
                <requestId>7a62c49f-347e-4fc4-9331-6e8eEXAMPLE</requestId>
                <return>true</return>

tests/unit/vpc/test_dhcpoptions.py

@@ -9,7 +9,7 @@ class TestDescribeDhcpOptions(AWSMockServiceTestCase):
     connection_class = VPCConnection
 
     def default_body(self):
-        return """
+        return b"""
             <DescribeDhcpOptionsResponse xmlns="http://ec2.amazonaws.com/doc/2013-10-01/">
               <requestId>7a62c49f-347e-4fc4-9331-6e8eEXAMPLE</requestId>
               <dhcpOptionsSet>
@@ -71,7 +71,7 @@ class TestCreateDhcpOptions(AWSMockServiceTestCase):
     connection_class = VPCConnection
 
     def default_body(self):
-        return """
+        return b"""
             <CreateDhcpOptionsResponse xmlns="http://ec2.amazonaws.com/doc/2013-10-01/">
               <requestId>7a62c49f-347e-4fc4-9331-6e8eEXAMPLE</requestId>
               <dhcpOptions>
@@ -167,7 +167,7 @@ class TestDeleteDhcpOptions(AWSMockServiceTestCase):
     connection_class = VPCConnection
 
     def default_body(self):
-        return """
+        return b"""
             <DeleteDhcpOptionsResponse xmlns="http://ec2.amazonaws.com/doc/2013-10-01/">
                <requestId>7a62c49f-347e-4fc4-9331-6e8eEXAMPLE</requestId>
                <return>true</return>
@@ -191,7 +191,7 @@ class TestAssociateDhcpOptions(AWSMockServiceTestCase):
     connection_class = VPCConnection
 
     def default_body(self):
-        return """
+        return b"""
             <AssociateDhcpOptionsResponse xmlns="http://ec2.amazonaws.com/doc/2013-10-01/">
                <requestId>7a62c49f-347e-4fc4-9331-6e8eEXAMPLE</requestId>
                <return>true</return>

tests/unit/vpc/test_internetgateway.py

@@ -9,7 +9,7 @@ class TestDescribeInternetGateway(AWSMockServiceTestCase):
     connection_class = VPCConnection
 
     def default_body(self):
-        return """
+        return b"""
             <DescribeInternetGatewaysResponse xmlns="http://ec2.amazonaws.com/doc/2013-10-01/">
                <requestId>59dbff89-35bd-4eac-99ed-be587EXAMPLE</requestId>
                <internetGatewaySet>
@@ -50,7 +50,7 @@ class TestCreateInternetGateway(AWSMockServiceTestCase):
     connection_class = VPCConnection
 
     def default_body(self):
-        return """
+        return b"""
             <CreateInternetGatewayResponse xmlns="http://ec2.amazonaws.com/doc/2013-10-01/">
                <requestId>59dbff89-35bd-4eac-99ed-be587EXAMPLE</requestId>
                <internetGateway>
@@ -78,7 +78,7 @@ class TestDeleteInternetGateway(AWSMockServiceTestCase):
     connection_class = VPCConnection
 
     def default_body(self):
-        return """
+        return b"""
             <DeleteInternetGatewayResponse xmlns="http://ec2.amazonaws.com/doc/2013-10-01/">
                <requestId>59dbff89-35bd-4eac-99ed-be587EXAMPLE</requestId>
                <return>true</return>
@@ -102,7 +102,7 @@ class TestAttachInternetGateway(AWSMockServiceTestCase):
     connection_class = VPCConnection
 
     def default_body(self):
-        return """
+        return b"""
             <AttachInternetGatewayResponse xmlns="http://ec2.amazonaws.com/doc/2013-10-01/">
                <requestId>59dbff89-35bd-4eac-99ed-be587EXAMPLE</requestId>
                <return>true</return>
@@ -128,7 +128,7 @@ class TestDetachInternetGateway(AWSMockServiceTestCase):
     connection_class = VPCConnection
 
     def default_body(self):
-        return """
+        return b"""
             <DetachInternetGatewayResponse xmlns="http://ec2.amazonaws.com/doc/2013-10-01/">
                <requestId>59dbff89-35bd-4eac-99ed-be587EXAMPLE</requestId>
                <return>true</return>