Error handling: Model-level validations, proper error responses. (backport assert_raises as context manager for Python 2.6)

tests/test_ec2/test_amis.py

@@ -1,8 +1,11 @@
+# Ensure 'assert_raises' context manager support for Python 2.6
+import tests.backport_assert_raises
+from nose.tools import assert_raises
+
 import boto
 from boto.exception import EC2ResponseError
 
 import sure  # noqa
-from nose.tools import assert_raises
 
 from moto import mock_ec2
 

tests/test_ec2/test_dhcp_options.py

@@ -1,8 +1,11 @@
+# Ensure 'assert_raises' context manager support for Python 2.6
+import tests.backport_assert_raises
+from nose.tools import assert_raises
+
 import boto
 from boto.exception import EC2ResponseError
 
 import sure  # noqa
-from nose.tools import assert_raises
 
 from moto import mock_ec2
 

tests/test_ec2/test_elastic_block_store.py

@@ -1,7 +1,10 @@
+# Ensure 'assert_raises' context manager support for Python 2.6
+import tests.backport_assert_raises
+from nose.tools import assert_raises
+
 import boto
 from boto.exception import EC2ResponseError
 import sure  # noqa
-from nose.tools import assert_raises
 
 from moto import mock_ec2
 from moto.ec2.models import ec2_backend

tests/test_ec2/test_elastic_ip_addresses.py

@@ -1,9 +1,11 @@
-"""Test mocking of Elatic IP Address"""
+# Ensure 'assert_raises' context manager support for Python 2.6
+import tests.backport_assert_raises
+from nose.tools import assert_raises
+
 import boto
 from boto.exception import EC2ResponseError
 
 import sure  # noqa
-from nose.tools import assert_raises
 
 from moto import mock_ec2
 

tests/test_ec2/test_general.py

@@ -1,7 +1,10 @@
+# Ensure 'assert_raises' context manager support for Python 2.6
+import tests.backport_assert_raises
+from nose.tools import assert_raises
+
 import boto
 from boto.exception import EC2ResponseError
 import sure  # noqa
-from nose.tools import assert_raises
 
 from moto import mock_ec2
 

tests/test_ec2/test_instances.py

@@ -1,10 +1,13 @@
+# Ensure 'assert_raises' context manager support for Python 2.6
+import tests.backport_assert_raises
+from nose.tools import assert_raises
+
 import base64
 
 import boto
 from boto.ec2.instance import Reservation, InstanceAttribute
 from boto.exception import EC2ResponseError
 import sure  # noqa
-from nose.tools import assert_raises
 
 from moto import mock_ec2
 

tests/test_ec2/test_internet_gateways.py

@@ -1,10 +1,13 @@
+# Ensure 'assert_raises' context manager support for Python 2.6
+import tests.backport_assert_raises
+from nose.tools import assert_raises
+
 import re
 
 import boto
 from boto.exception import EC2ResponseError
 
 import sure  # noqa
-from nose.tools import assert_raises
 
 from moto import mock_ec2
 

tests/test_ec2/test_key_pairs.py

@@ -1,6 +1,9 @@
+# Ensure 'assert_raises' context manager support for Python 2.6
+import tests.backport_assert_raises
+from nose.tools import assert_raises
+
 import boto
 import sure  # noqa
-from nose.tools import assert_raises
 
 from boto.exception import EC2ResponseError
 from moto import mock_ec2

tests/test_ec2/test_security_groups.py

@@ -1,7 +1,10 @@
+# Ensure 'assert_raises' context manager support for Python 2.6
+import tests.backport_assert_raises
+from nose.tools import assert_raises
+
 import boto
 from boto.exception import EC2ResponseError
 import sure  # noqa
-from nose.tools import assert_raises
 
 from moto import mock_ec2
 

tests/test_ec2/test_subnets.py

@@ -1,7 +1,10 @@
+# Ensure 'assert_raises' context manager support for Python 2.6
+import tests.backport_assert_raises
+from nose.tools import assert_raises
+
 import boto
 from boto.exception import EC2ResponseError
 import sure  # noqa
-from nose.tools import assert_raises
 
 from moto import mock_ec2
 

tests/test_ec2/test_vpc_peering.py

@@ -1,7 +1,10 @@
+# Ensure 'assert_raises' context manager support for Python 2.6
+import tests.backport_assert_raises
+from nose.tools import assert_raises
+
 import boto
 from boto.exception import EC2ResponseError
 import sure  # noqa
-from nose.tools import assert_raises
 
 from moto import mock_ec2
 from tests.helpers import requires_boto_gte

tests/test_ec2/test_vpcs.py

@@ -1,7 +1,10 @@
+# Ensure 'assert_raises' context manager support for Python 2.6
+import tests.backport_assert_raises
+from nose.tools import assert_raises
+
 import boto
 from boto.exception import EC2ResponseError
 import sure  # noqa
-from nose.tools import assert_raises
 
 from moto import mock_ec2