Techdebt: Enable pylint rules (#4432)

moto/__init__.py

@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import importlib
 
 

moto/acm/__init__.py

@@ -1,4 +1,3 @@
-from __future__ import unicode_literals
 from .models import acm_backends
 from ..core.models import base_decorator
 

moto/acm/models.py

@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import base64
 import re
 import datetime

moto/acm/responses.py

@@ -1,4 +1,3 @@
-from __future__ import unicode_literals
 import json
 import base64
 

moto/acm/urls.py

@@ -1,4 +1,3 @@
-from __future__ import unicode_literals
 from .responses import AWSCertificateManagerResponse
 
 url_bases = [r"https?://acm\.(.+)\.amazonaws\.com"]

moto/apigateway/__init__.py

@@ -1,4 +1,3 @@
-from __future__ import unicode_literals
 from .models import apigateway_backends
 from ..core.models import base_decorator, deprecated_base_decorator
 

moto/apigateway/exceptions.py

@@ -1,4 +1,3 @@
-from __future__ import unicode_literals
 from moto.core.exceptions import JsonRESTError
 
 

moto/apigateway/models.py

@@ -1,5 +1,4 @@
 from __future__ import absolute_import
-from __future__ import unicode_literals
 
 import random
 import string

moto/apigateway/responses.py

@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import json
 
 from moto.utilities.utils import merge_multiple_dicts

moto/apigateway/urls.py

@@ -1,4 +1,3 @@
-from __future__ import unicode_literals
 from .responses import APIGatewayResponse
 
 response = APIGatewayResponse()

moto/apigateway/utils.py

@@ -1,4 +1,3 @@
-from __future__ import unicode_literals
 import random
 import string
 

moto/applicationautoscaling/__init__.py

@@ -1,4 +1,3 @@
-from __future__ import unicode_literals
 from .models import applicationautoscaling_backends
 from ..core.models import base_decorator
 

moto/applicationautoscaling/exceptions.py

@@ -1,4 +1,3 @@
-from __future__ import unicode_literals
 from moto.core.exceptions import JsonRESTError
 
 

moto/applicationautoscaling/models.py

@@ -1,4 +1,3 @@
-from __future__ import unicode_literals
 from moto.core import BaseBackend, BaseModel
 from moto.ecs import ecs_backends
 from .exceptions import AWSValidationException

moto/applicationautoscaling/responses.py

@@ -1,4 +1,3 @@
-from __future__ import unicode_literals
 from moto.core.responses import BaseResponse
 import json
 from .models import (

moto/applicationautoscaling/urls.py

@@ -1,4 +1,3 @@
-from __future__ import unicode_literals
 from .responses import ApplicationAutoScalingResponse
 
 url_bases = [r"https?://application-autoscaling\.(.+)\.amazonaws.com"]

moto/athena/__init__.py

@@ -1,4 +1,3 @@
-from __future__ import unicode_literals
 from .models import athena_backends
 from ..core.models import base_decorator, deprecated_base_decorator
 

moto/athena/exceptions.py

@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import json
 from werkzeug.exceptions import BadRequest
 

moto/athena/models.py

@@ -1,4 +1,3 @@
-from __future__ import unicode_literals
 import time
 
 from boto3 import Session

moto/athena/urls.py

@@ -1,4 +1,3 @@
-from __future__ import unicode_literals
 from .responses import AthenaResponse
 
 url_bases = [r"https?://athena\.(.+)\.amazonaws\.com"]

moto/athena/utils.py

@@ -1 +0,0 @@
-from __future__ import unicode_literals

moto/autoscaling/__init__.py

@@ -1,4 +1,3 @@
-from __future__ import unicode_literals
 from .models import autoscaling_backends
 from ..core.models import base_decorator, deprecated_base_decorator
 

moto/autoscaling/exceptions.py

@@ -1,4 +1,3 @@
-from __future__ import unicode_literals
 from moto.core.exceptions import RESTError
 
 

moto/autoscaling/models.py

@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import random
 
 from moto.packages.boto.ec2.blockdevicemapping import (

moto/autoscaling/responses.py

@@ -1,4 +1,3 @@
-from __future__ import unicode_literals
 import datetime
 
 from moto.core.responses import BaseResponse

moto/autoscaling/urls.py

@@ -1,4 +1,3 @@
-from __future__ import unicode_literals
 from .responses import AutoScalingResponse
 
 url_bases = [r"https?://autoscaling\.(.+)\.amazonaws\.com"]

moto/awslambda/__init__.py

@@ -1,4 +1,3 @@
-from __future__ import unicode_literals
 from .models import lambda_backends
 from ..core.models import base_decorator, deprecated_base_decorator
 

moto/awslambda/models.py

@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import base64
 import time
 from collections import defaultdict

moto/awslambda/policy.py

@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import json
 import uuid
 

moto/awslambda/responses.py

@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import json
 
 try:

moto/awslambda/urls.py

@@ -1,4 +1,3 @@
-from __future__ import unicode_literals
 from .responses import LambdaResponse
 
 url_bases = [r"https?://lambda\.(.+)\.amazonaws\.com"]

moto/backends.py

@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import importlib
 import moto
 import sys

moto/batch/__init__.py

@@ -1,4 +1,3 @@
-from __future__ import unicode_literals
 from .models import batch_backends
 from ..core.models import base_decorator
 

moto/batch/exceptions.py

@@ -1,4 +1,3 @@
-from __future__ import unicode_literals
 from moto.core.exceptions import AWSError
 
 

moto/batch/models.py

@@ -1,4 +1,3 @@
-from __future__ import unicode_literals
 import re
 from itertools import cycle
 import datetime

moto/batch/responses.py

@@ -1,4 +1,3 @@
-from __future__ import unicode_literals
 from moto.core.responses import BaseResponse
 from .models import batch_backends
 from urllib.parse import urlsplit

moto/batch/urls.py

@@ -1,4 +1,3 @@
-from __future__ import unicode_literals
 from .responses import BatchResponse
 
 url_bases = [r"https?://batch\.(.+)\.amazonaws.com"]

moto/batch/utils.py

@@ -1,6 +1,3 @@
-from __future__ import unicode_literals
-
-
 def make_arn_for_compute_env(account_id, name, region_name):
     return "arn:aws:batch:{0}:{1}:compute-environment/{2}".format(
         region_name, account_id, name

moto/cloudformation/__init__.py

@@ -1,4 +1,3 @@
-from __future__ import unicode_literals
 from .models import cloudformation_backends
 from ..core.models import base_decorator, deprecated_base_decorator
 

moto/cloudformation/exceptions.py

@@ -1,4 +1,3 @@
-from __future__ import unicode_literals
 from werkzeug.exceptions import BadRequest
 from jinja2 import Template
 

moto/cloudformation/models.py

@@ -1,4 +1,3 @@
-from __future__ import unicode_literals
 from datetime import datetime, timedelta
 import json
 import yaml

moto/cloudformation/parsing.py

@@ -1,4 +1,3 @@
-from __future__ import unicode_literals
 import functools
 import json
 import logging

moto/cloudformation/responses.py

@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import json
 import yaml
 from urllib.parse import urlparse

moto/cloudformation/urls.py

@@ -1,4 +1,3 @@
-from __future__ import unicode_literals
 from .responses import CloudFormationResponse
 
 url_bases = [r"https?://cloudformation\.(.+)\.amazonaws\.com"]

moto/cloudformation/utils.py

@@ -1,4 +1,3 @@
-from __future__ import unicode_literals
 import uuid
 import random
 import yaml

moto/cloudwatch/utils.py

@@ -1,6 +1,3 @@
-from __future__ import unicode_literals
-
-
 def make_arn_for_dashboard(account_id, name):
     return "arn:aws:cloudwatch::{0}dashboard/{1}".format(account_id, name)
 

moto/codecommit/urls.py

@@ -1,4 +1,3 @@
-from __future__ import unicode_literals
 from .responses import CodeCommitResponse
 
 url_bases = [r"https?://codecommit\.(.+)\.amazonaws\.com"]

moto/codepipeline/urls.py

@@ -1,4 +1,3 @@
-from __future__ import unicode_literals
 from .responses import CodePipelineResponse
 
 url_bases = [r"https?://codepipeline\.(.+)\.amazonaws\.com"]

moto/cognitoidentity/__init__.py

@@ -1,4 +1,3 @@
-from __future__ import unicode_literals
 from .models import cognitoidentity_backends
 from ..core.models import base_decorator, deprecated_base_decorator
 

moto/cognitoidentity/exceptions.py

@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import json
 
 from werkzeug.exceptions import BadRequest

moto/cognitoidentity/models.py

@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import datetime
 import json
 import re

moto/cognitoidentity/responses.py

@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from moto.core.responses import BaseResponse
 from .models import cognitoidentity_backends
 from .utils import get_random_identity_id

moto/cognitoidentity/urls.py

@@ -1,4 +1,3 @@
-from __future__ import unicode_literals
 from .responses import CognitoIdentityResponse
 
 url_bases = [r"https?://cognito-identity\.(.+)\.amazonaws.com"]

moto/cognitoidp/__init__.py

@@ -1,4 +1,3 @@
-from __future__ import unicode_literals
 from .models import cognitoidp_backends
 from ..core.models import base_decorator, deprecated_base_decorator
 

moto/cognitoidp/exceptions.py

@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import json
 from werkzeug.exceptions import BadRequest
 from moto.core.exceptions import JsonRESTError

moto/cognitoidp/models.py

@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import datetime
 import hashlib
 import json

moto/cognitoidp/responses.py

@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import json
 import os
 import re

moto/cognitoidp/urls.py

@@ -1,4 +1,3 @@
-from __future__ import unicode_literals
 from .responses import CognitoIdpResponse, CognitoIdpJsonWebKeyResponse
 
 url_bases = [r"https?://cognito-idp\.(.+)\.amazonaws.com"]

moto/cognitoidp/utils.py

@@ -1,4 +1,3 @@
-from __future__ import unicode_literals
 import random
 import string
 import hashlib

moto/config/urls.py

@@ -1,4 +1,3 @@
-from __future__ import unicode_literals
 from .responses import ConfigResponse
 
 url_bases = [r"https?://config\.(.+)\.amazonaws\.com"]

moto/core/__init__.py

@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from .models import BaseModel, BaseBackend, moto_api_backend, ACCOUNT_ID  # noqa
 from .models import CloudFormationModel  # noqa
 from .responses import ActionAuthenticatorMixin

moto/core/exceptions.py

@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from werkzeug.exceptions import HTTPException
 from jinja2 import DictLoader, Environment
 import json

moto/core/models.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 import functools
 import inspect
 import os

moto/core/responses.py

@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import functools
 from collections import defaultdict
 import datetime

moto/core/urls.py

@@ -1,4 +1,3 @@
-from __future__ import unicode_literals
 from .responses import MotoAPIResponse
 
 url_bases = ["https?://motoapi.amazonaws.com"]

moto/core/utils.py

@@ -1,4 +1,3 @@
-from __future__ import unicode_literals
 from functools import wraps
 
 import binascii
@@ -317,30 +316,6 @@ def path_url(url):
     return path
 
 
-def py2_strip_unicode_keys(blob):
-    """For Python 2 Only -- this will convert unicode keys in nested Dicts, Lists, and Sets to standard strings."""
-    if type(blob) == unicode:  # noqa
-        return str(blob)
-
-    elif type(blob) == dict:
-        for key in list(blob.keys()):
-            value = blob.pop(key)
-            blob[str(key)] = py2_strip_unicode_keys(value)
-
-    elif type(blob) == list:
-        for i in range(0, len(blob)):
-            blob[i] = py2_strip_unicode_keys(blob[i])
-
-    elif type(blob) == set:
-        new_set = set()
-        for value in blob:
-            new_set.add(py2_strip_unicode_keys(value))
-
-        blob = new_set
-
-    return blob
-
-
 def tags_from_query_string(
     querystring_dict, prefix="Tag", key_suffix="Key", value_suffix="Value"
 ):

moto/datapipeline/__init__.py

@@ -1,4 +1,3 @@
-from __future__ import unicode_literals
 from .models import datapipeline_backends
 from ..core.models import base_decorator, deprecated_base_decorator
 

moto/datapipeline/models.py

@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import datetime
 from boto3 import Session
 

moto/datapipeline/responses.py

@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import json
 
 from moto.core.responses import BaseResponse

moto/datapipeline/urls.py

@@ -1,4 +1,3 @@
-from __future__ import unicode_literals
 from .responses import DataPipelineResponse
 
 url_bases = [r"https?://datapipeline\.(.+)\.amazonaws\.com"]

moto/datasync/__init__.py

@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from ..core.models import base_decorator, deprecated_base_decorator
 from .models import datasync_backends
 

moto/datasync/exceptions.py

@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from moto.core.exceptions import JsonRESTError
 
 

moto/datasync/urls.py

@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from .responses import DataSyncResponse
 
 url_bases = [r"https?://(.*\.)?(datasync)\.(.+)\.amazonaws.com"]

moto/dms/__init__.py

@@ -1,4 +1,3 @@
-from __future__ import unicode_literals
 from .models import dms_backends
 from ..core.models import base_decorator
 

moto/dms/exceptions.py

@@ -1,4 +1,3 @@
-from __future__ import unicode_literals
 from moto.core.exceptions import JsonRESTError
 
 

moto/dms/models.py

@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import json
 
 from boto3 import Session

moto/dms/responses.py

@@ -1,4 +1,3 @@
-from __future__ import unicode_literals
 from moto.core.responses import BaseResponse
 from .models import dms_backends
 import json

moto/dms/urls.py

@@ -1,4 +1,3 @@
-from __future__ import unicode_literals
 from .responses import DatabaseMigrationServiceResponse
 
 url_bases = [r"https?://dms\.(.+)\.amazonaws\.com"]

moto/dms/utils.py

@@ -1,6 +1,3 @@
-from __future__ import unicode_literals
-
-
 def match_task_arn(task, arns):
     return task["ReplicationTaskArn"] in arns
 

moto/dynamodb/__init__.py

@@ -1,4 +1,3 @@
-from __future__ import unicode_literals
 from .models import dynamodb_backend
 
 dynamodb_backends = {"global": dynamodb_backend}

moto/dynamodb/comparisons.py

@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 # TODO add tests for all of these
 COMPARISON_FUNCS = {
     "EQ": lambda item_value, test_value: item_value == test_value,

moto/dynamodb/models.py

@@ -1,4 +1,3 @@
-from __future__ import unicode_literals
 from collections import defaultdict
 import datetime
 import json

moto/dynamodb/responses.py

@@ -1,4 +1,3 @@
-from __future__ import unicode_literals
 import json
 
 from moto.core.responses import BaseResponse

moto/dynamodb/urls.py

@@ -1,4 +1,3 @@
-from __future__ import unicode_literals
 from .responses import DynamoHandler
 
 url_bases = [r"https?://dynamodb\.(.+)\.amazonaws\.com"]

moto/dynamodb2/__init__.py

@@ -1,4 +1,3 @@
-from __future__ import unicode_literals
 from moto.dynamodb2.models import dynamodb_backends as dynamodb_backends2
 from ..core.models import base_decorator, deprecated_base_decorator
 

moto/dynamodb2/comparisons.py

@@ -1,4 +1,3 @@
-from __future__ import unicode_literals
 import re
 from collections import deque
 from collections import namedtuple

moto/dynamodb2/models/__init__.py

@@ -1,4 +1,3 @@
-from __future__ import unicode_literals
 from collections import defaultdict
 import copy
 import datetime

moto/dynamodb2/responses.py

@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import copy
 import json
 import re

moto/dynamodb2/urls.py

@@ -1,4 +1,3 @@
-from __future__ import unicode_literals
 from .responses import DynamoHandler
 
 url_bases = [r"https?://dynamodb\.(.+)\.amazonaws\.com"]

moto/dynamodbstreams/__init__.py

@@ -1,4 +1,3 @@
-from __future__ import unicode_literals
 from .models import dynamodbstreams_backends
 from ..core.models import base_decorator
 

moto/dynamodbstreams/models.py

@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import os
 import json
 import base64

moto/dynamodbstreams/responses.py

@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from moto.core.responses import BaseResponse
 
 from .models import dynamodbstreams_backends

moto/dynamodbstreams/urls.py

@@ -1,4 +1,3 @@
-from __future__ import unicode_literals
 from .responses import DynamoDBStreamsHandler
 
 url_bases = [r"https?://streams\.dynamodb\.(.+)\.amazonaws.com"]

moto/ec2/__init__.py

@@ -1,4 +1,3 @@
-from __future__ import unicode_literals
 from .models import ec2_backends
 from ..core.models import base_decorator, deprecated_base_decorator
 

moto/ec2/exceptions.py

@@ -1,4 +1,3 @@
-from __future__ import unicode_literals
 from moto.core.exceptions import RESTError
 
 

moto/ec2/models.py

@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import copy
 from datetime import datetime
 import itertools

moto/ec2/responses/__init__.py

@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from .account_attributes import AccountAttributes
 from .amazon_dev_pay import AmazonDevPay
 from .amis import AmisResponse

moto/ec2/responses/account_attributes.py

@@ -1,4 +1,3 @@
-from __future__ import unicode_literals
 from moto.core.responses import BaseResponse
 
 

moto/ec2/responses/amazon_dev_pay.py

@@ -1,4 +1,3 @@
-from __future__ import unicode_literals
 from moto.core.responses import BaseResponse
 
 

moto/ec2/responses/amis.py

@@ -1,4 +1,3 @@
-from __future__ import unicode_literals
 from moto.core.responses import BaseResponse
 from moto.ec2.utils import filters_from_querystring