Tech debt (#3653)

tests/test_ec2/test_amis.py

@@ -6,7 +6,6 @@ import boto3
 from boto.exception import EC2ResponseError
 from botocore.exceptions import ClientError
 
-# Ensure 'pytest.raises' context manager support for Python 2.6
 import pytest
 import sure  # noqa
 

tests/test_ec2/test_dhcp_options.py

@@ -1,6 +1,5 @@
 from __future__ import unicode_literals
 
-# Ensure 'pytest.raises' context manager support for Python 2.6
 import pytest
 
 import boto3

tests/test_ec2/test_elastic_block_store.py

@@ -3,7 +3,6 @@ from __future__ import unicode_literals
 import boto
 import boto3
 
-# Ensure 'pytest.raises' context manager support for Python 2.6
 import pytest
 import sure  # noqa
 from boto.exception import EC2ResponseError

tests/test_ec2/test_elastic_ip_addresses.py

@@ -1,6 +1,5 @@
 from __future__ import unicode_literals
 
-# Ensure 'pytest.raises' context manager support for Python 2.6
 import pytest
 
 import boto

tests/test_ec2/test_elastic_network_interfaces.py

@@ -1,6 +1,5 @@
 from __future__ import unicode_literals
 
-# Ensure 'pytest.raises' context manager support for Python 2.6
 import pytest
 
 import boto3

tests/test_ec2/test_general.py

@@ -1,6 +1,5 @@
 from __future__ import unicode_literals
 
-# Ensure 'pytest.raises' context manager support for Python 2.6
 import pytest
 
 import boto

tests/test_ec2/test_iam_instance_profile_associations.py

@@ -1,6 +1,5 @@
 from __future__ import unicode_literals
 
-# Ensure 'pytest.raises' context manager support for Python 2.6
 import pytest
 
 import time

tests/test_ec2/test_instances.py

@@ -1,6 +1,5 @@
 from __future__ import unicode_literals
 
-# Ensure 'pytest.raises' context manager support for Python 2.6
 from botocore.exceptions import ClientError
 
 import pytest

tests/test_ec2/test_internet_gateways.py

@@ -1,6 +1,5 @@
 from __future__ import unicode_literals
 
-# Ensure 'pytest.raises' context manager support for Python 2.6
 import pytest
 
 import re

tests/test_ec2/test_key_pairs.py

@@ -1,6 +1,5 @@
 from __future__ import unicode_literals
 
-# Ensure 'pytest.raises' context manager support for Python 2.6
 import pytest
 
 import boto

tests/test_ec2/test_route_tables.py

@@ -1,6 +1,5 @@
 from __future__ import unicode_literals
 
-# Ensure 'pytest.raises' context manager support for Python 2.6
 import pytest
 
 import boto

tests/test_ec2/test_security_groups.py

@@ -3,7 +3,6 @@ from __future__ import unicode_literals
 import copy
 import json
 
-# Ensure 'pytest.raises' context manager support for Python 2.6
 import pytest
 
 import boto3

tests/test_ec2/test_subnets.py

@@ -6,7 +6,6 @@ import boto
 import boto3
 import boto.vpc
 
-# Ensure 'pytest.raises' context manager support for Python 2.6
 import pytest
 import sure  # noqa
 from boto.exception import EC2ResponseError

tests/test_ec2/test_vpc_peering.py

@@ -1,6 +1,5 @@
 from __future__ import unicode_literals
 
-# Ensure 'pytest.raises' context manager support for Python 2.6
 import pytest
 from moto.ec2.exceptions import EC2ClientError
 from botocore.exceptions import ClientError

tests/test_ec2/test_vpcs.py

@@ -1,6 +1,5 @@
 from __future__ import unicode_literals
 
-# Ensure 'pytest.raises' context manager support for Python 2.6
 import pytest
 from moto.ec2.exceptions import EC2ClientError
 from botocore.exceptions import ClientError