Some flake8 cleanup.

moto/__init__.py

@@ -2,19 +2,19 @@ from __future__ import unicode_literals
 import logging
 logging.getLogger('boto').setLevel(logging.CRITICAL)
 
-from .autoscaling import mock_autoscaling
+from .autoscaling import mock_autoscaling  # flake8: noqa
-from .cloudformation import mock_cloudformation
+from .cloudformation import mock_cloudformation  # flake8: noqa
-from .cloudwatch import mock_cloudwatch
+from .cloudwatch import mock_cloudwatch  # flake8: noqa
-from .dynamodb import mock_dynamodb
+from .dynamodb import mock_dynamodb  # flake8: noqa
-from .dynamodb2 import mock_dynamodb2
+from .dynamodb2 import mock_dynamodb2  # flake8: noqa
-from .ec2 import mock_ec2
+from .ec2 import mock_ec2  # flake8: noqa
-from .elb import mock_elb
+from .elb import mock_elb  # flake8: noqa
-from .emr import mock_emr
+from .emr import mock_emr  # flake8: noqa
-from .iam import mock_iam
+from .iam import mock_iam  # flake8: noqa
-from .s3 import mock_s3
+from .s3 import mock_s3  # flake8: noqa
-from .s3bucket_path import mock_s3bucket_path
+from .s3bucket_path import mock_s3bucket_path  # flake8: noqa
-from .ses import mock_ses
+from .ses import mock_ses  # flake8: noqa
-from .sns import mock_sns
+from .sns import mock_sns  # flake8: noqa
-from .sqs import mock_sqs
+from .sqs import mock_sqs  # flake8: noqa
-from .sts import mock_sts
+from .sts import mock_sts  # flake8: noqa
-from .route53 import mock_route53
+from .route53 import mock_route53  # flake8: noqa

moto/autoscaling/__init__.py

@@ -1,5 +1,5 @@
 from __future__ import unicode_literals
-from .models import autoscaling_backend, autoscaling_backends
+from .models import autoscaling_backend, autoscaling_backends  # flake8: noqa
 from ..core.models import MockAWS
 
 

moto/core/__init__.py

@@ -1,2 +1,2 @@
 from __future__ import unicode_literals
-from .models import BaseBackend
+from .models import BaseBackend  # flake8: noqa

moto/dynamodb2/models.py

@@ -69,6 +69,7 @@ class DynamoType(object):
         comparison_func = get_comparison_func(range_comparison)
         return comparison_func(self.value, *range_values)
 
+
 class Item(object):
     def __init__(self, hash_key, hash_key_type, range_key, range_key_type, attrs):
         self.hash_key = hash_key
@@ -104,6 +105,7 @@ class Item(object):
             "Item": included
         }
 
+
 class Table(object):
 
     def __init__(self, table_name, schema=None, attr=None, throughput=None, indexes=None):
@@ -122,7 +124,7 @@ class Table(object):
                 self.range_key_attr = elem["AttributeName"]
                 self.range_key_type = elem["KeyType"]
         if throughput is None:
-             self.throughput = {u'WriteCapacityUnits': 10, u'ReadCapacityUnits': 10}
+            self.throughput = {'WriteCapacityUnits': 10, 'ReadCapacityUnits': 10}
         else:
             self.throughput = throughput
         self.throughput["NumberOfDecreasesToday"] = 0
@@ -141,7 +143,7 @@ class Table(object):
                 'TableStatus': 'ACTIVE',
                 'KeySchema': self.schema,
                 'ItemCount': len(self),
-            'CreationDateTime': unix_time(self.created_at)
+                'CreationDateTime': unix_time(self.created_at),
             }
         }
         return results
@@ -285,7 +287,7 @@ class DynamoDBBackend(BaseBackend):
             return table.hash_key_attr, table.range_key_attr
 
     def get_keys_value(self, table, keys):
-        if not table.hash_key_attr in keys or (table.has_range_key and not table.range_key_attr in keys):
+        if table.hash_key_attr not in keys or (table.has_range_key and table.range_key_attr not in keys):
             raise ValueError("Table has a range key, but no range key was passed into get_item")
         hash_key = DynamoType(keys[table.hash_key_attr])
         range_key = DynamoType(keys[table.range_key_attr]) if table.has_range_key else None

moto/dynamodb2/responses.py

@@ -169,6 +169,7 @@ class DynamoHandler(BaseResponse):
         }
 
         return dynamo_json_dump(response)
+
     def get_item(self):
         name = self.body['TableName']
         key = self.body['Key']
@@ -198,7 +199,6 @@ class DynamoHandler(BaseResponse):
         }
 
         for table_name, table_request in table_batches.items():
-            items = []
             keys = table_request['Keys']
             attributes_to_get = table_request.get('AttributesToGet')
             results["Responses"][table_name] = []
@@ -226,7 +226,7 @@ class DynamoHandler(BaseResponse):
             range_comparison = None
             range_values = []
         else:
-            if range_key_name == None:
+            if range_key_name is None:
                 er = "com.amazon.coral.validate#ValidationException"
                 return self.error(er)
             else:
@@ -247,7 +247,7 @@ class DynamoHandler(BaseResponse):
             items = items[:limit]
 
         reversed = self.body.get("ScanIndexForward")
-        if reversed != False:
+        if reversed is not False:
             items.reverse()
 
         result = {

moto/ec2/__init__.py

@@ -1,7 +1,8 @@
 from __future__ import unicode_literals
-from .models import ec2_backends, ec2_backend
+from .models import ec2_backend, ec2_backends  # flake8: noqa
 from ..core.models import MockAWS
 
+
 def mock_ec2(func=None):
     if func:
         return MockAWS(ec2_backends)(func)

moto/ec2/models.py

@@ -1,8 +1,9 @@
 from __future__ import unicode_literals
-import copy
+
-import itertools
 from collections import defaultdict
+import copy
 from datetime import datetime
+import itertools
 import re
 
 import six
@@ -11,6 +12,7 @@ from boto.ec2.instance import Instance as BotoInstance, Reservation
 from boto.ec2.blockdevicemapping import BlockDeviceMapping, BlockDeviceType
 from boto.ec2.spotinstancerequest import SpotInstanceRequest as BotoSpotRequest
 from boto.ec2.launchspecification import LaunchSpecification
+import six
 
 from moto.core import BaseBackend
 from moto.core.models import Model
@@ -245,7 +247,6 @@ class NetworkInterfaceBackend(object):
                     original_enis = enis
                     enis = []
                     for eni in original_enis:
-                        group_ids = []
                         for group in eni.group_set:
                             if group.id in _filter_value:
                                 enis.append(eni)
@@ -856,7 +857,6 @@ class AmiBackend(object):
     def describe_images(self, ami_ids=(), filters=None):
         if filters:
             images = self.amis.values()
-
             return generic_filter(filters, images)
         else:
             images = []
@@ -1008,10 +1008,7 @@ class SecurityGroup(object):
     def physical_resource_id(self):
         return self.id
 
-
     def matches_filter(self, key, filter_value):
-        result = True
-
         def to_attr(filter_name):
             attr = None
 
@@ -1031,7 +1028,7 @@ class SecurityGroup(object):
             ingress_attr = to_attr(match.groups()[0])
 
             for ingress in self.ingress_rules:
-                if getattr(ingress, ingress_attr) in filters[key]:
+                if getattr(ingress, ingress_attr) in filter_value:
                     return True
         else:
             attr_name = to_attr(key)
@@ -1302,7 +1299,7 @@ class EBSBackend(object):
 
     def detach_volume(self, volume_id, instance_id, device_path):
         volume = self.get_volume(volume_id)
-        instance = self.get_instance(instance_id)
+        self.get_instance(instance_id)
 
         old_attachment = volume.attachment
         if not old_attachment:
@@ -1406,7 +1403,7 @@ class VPCBackend(object):
         self.vpcs[vpc_id] = vpc
 
         # AWS creates a default main route table and security group.
-        main_route_table = self.create_route_table(vpc_id, main=True)
+        self.create_route_table(vpc_id, main=True)
 
         default = self.get_security_group_from_name('default', vpc_id=vpc_id)
         if not default:
@@ -1599,7 +1596,7 @@ class SubnetBackend(object):
     def create_subnet(self, vpc_id, cidr_block):
         subnet_id = random_subnet_id()
         subnet = Subnet(self, subnet_id, vpc_id, cidr_block)
-        vpc = self.get_vpc(vpc_id) # Validate VPC exists
+        self.get_vpc(vpc_id) # Validate VPC exists
         self.subnets[subnet_id] = subnet
         return subnet
 

moto/ec2/responses/elastic_block_store.py

@@ -35,12 +35,12 @@ class ElasticBlockStore(BaseResponse):
 
     def delete_snapshot(self):
         snapshot_id = self.querystring.get('SnapshotId')[0]
-        success = self.ec2_backend.delete_snapshot(snapshot_id)
+        self.ec2_backend.delete_snapshot(snapshot_id)
         return DELETE_SNAPSHOT_RESPONSE
 
     def delete_volume(self):
         volume_id = self.querystring.get('VolumeId')[0]
-        success = self.ec2_backend.delete_volume(volume_id)
+        self.ec2_backend.delete_volume(volume_id)
         return DELETE_VOLUME_RESPONSE
 
     def describe_snapshots(self):

moto/ec2/responses/elastic_ip_addresses.py

@@ -59,9 +59,9 @@ class ElasticIPAddresses(BaseResponse):
 
     def disassociate_address(self):
         if "PublicIp" in self.querystring:
-            disassociated = self.ec2_backend.disassociate_address(address=self.querystring['PublicIp'][0])
+            self.ec2_backend.disassociate_address(address=self.querystring['PublicIp'][0])
         elif "AssociationId" in self.querystring:
-            disassociated = self.ec2_backend.disassociate_address(association_id=self.querystring['AssociationId'][0])
+            self.ec2_backend.disassociate_address(association_id=self.querystring['AssociationId'][0])
         else:
             self.ec2_backend.raise_error("MissingParameter", "Invalid request, expect PublicIp/AssociationId parameter.")
 
@@ -69,9 +69,9 @@ class ElasticIPAddresses(BaseResponse):
 
     def release_address(self):
         if "PublicIp" in self.querystring:
-            released = self.ec2_backend.release_address(address=self.querystring['PublicIp'][0])
+            self.ec2_backend.release_address(address=self.querystring['PublicIp'][0])
         elif "AllocationId" in self.querystring:
-            released = self.ec2_backend.release_address(allocation_id=self.querystring['AllocationId'][0])
+            self.ec2_backend.release_address(allocation_id=self.querystring['AllocationId'][0])
         else:
             self.ec2_backend.raise_error("MissingParameter", "Invalid request, expect PublicIp/AllocationId parameter.")
 

moto/ec2/responses/internet_gateways.py

@@ -112,4 +112,3 @@ DETACH_INTERNET_GATEWAY_RESPONSE = u"""<DetachInternetGatewayResponse xmlns="htt
   <requestId>59dbff89-35bd-4eac-99ed-be587EXAMPLE</requestId>
   <return>true</return>
 </DetachInternetGatewayResponse>"""
-

moto/ec2/responses/route_tables.py

@@ -22,7 +22,7 @@ class RouteTables(BaseResponse):
         interface_id = optional_from_querystring('NetworkInterfaceId', self.querystring)
         pcx_id = optional_from_querystring('VpcPeeringConnectionId', self.querystring)
 
-        route = self.ec2_backend.create_route(route_table_id, destination_cidr_block,
+        self.ec2_backend.create_route(route_table_id, destination_cidr_block,
                                          gateway_id=internet_gateway_id,
                                          instance_id=instance_id,
                                          interface_id=interface_id,
@@ -72,7 +72,7 @@ class RouteTables(BaseResponse):
         interface_id = optional_from_querystring('NetworkInterfaceId', self.querystring)
         pcx_id = optional_from_querystring('VpcPeeringConnectionId', self.querystring)
 
-        route = self.ec2_backend.replace_route(route_table_id, destination_cidr_block,
+        self.ec2_backend.replace_route(route_table_id, destination_cidr_block,
                                           gateway_id=internet_gateway_id,
                                           instance_id=instance_id,
                                           interface_id=interface_id,

moto/ec2/responses/vpc_peering_connections.py

@@ -31,7 +31,7 @@ class VPCPeeringConnections(BaseResponse):
 
     def reject_vpc_peering_connection(self):
         vpc_pcx_id = self.querystring.get('VpcPeeringConnectionId')[0]
-        vpc_pcx = self.ec2_backend.reject_vpc_peering_connection(vpc_pcx_id)
+        self.ec2_backend.reject_vpc_peering_connection(vpc_pcx_id)
         template = Template(REJECT_VPC_PEERING_CONNECTION_RESPONSE)
         return template.render()
 
@@ -125,4 +125,3 @@ REJECT_VPC_PEERING_CONNECTION_RESPONSE = """
   <return>true</return>
 </RejectVpcPeeringConnectionResponse>
 """
-

moto/ec2/utils.py

@@ -130,7 +130,7 @@ def generate_route_id(route_table_id, cidr_block):
 
 
 def split_route_id(route_id):
-    values = string.split(route_id, '~')
+    values = route_id.split('~')
     return values[0], values[1]
 
 

moto/sqs/exceptions.py

@@ -1,4 +1,6 @@
 from __future__ import unicode_literals
+
+
 class MessageNotInflight(Exception):
     description = "The message referred to is not in flight."
     status_code = 400

moto/sqs/models.py

@@ -1,5 +1,5 @@
 from __future__ import unicode_literals
-import base64
+
 import hashlib
 import time
 import re

requirements-dev.txt

@@ -4,3 +4,4 @@ nose
 sure<1.2.4
 coverage
 freezegun
+flask

tox.ini

@@ -6,3 +6,6 @@ deps = -r{toxinidir}/requirements.txt
 commands =
     {envpython} setup.py test
     nosetests
+
+[flake8]
+ignore = E128,E501