Merge pull request #176 from singingwolfboy/unicode_literals

Unicode literals

moto/__init__.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 import logging
 logging.getLogger('boto').setLevel(logging.CRITICAL)
 

moto/autoscaling/__init__.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 from .models import autoscaling_backend, autoscaling_backends
 from ..core.models import MockAWS
 

moto/autoscaling/models.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 from boto.ec2.blockdevicemapping import BlockDeviceType, BlockDeviceMapping
 from moto.core import BaseBackend
 from moto.ec2 import ec2_backends

moto/autoscaling/responses.py

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

moto/autoscaling/urls.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 from .responses import AutoScalingResponse
 
 url_bases = [

moto/backends.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 from moto.autoscaling import autoscaling_backend
 from moto.dynamodb import dynamodb_backend
 from moto.dynamodb2 import dynamodb_backend2

moto/cloudformation/__init__.py

@@ -1,2 +1,3 @@
+from __future__ import unicode_literals
 from .models import cloudformation_backend
 mock_cloudformation = cloudformation_backend.decorator

moto/cloudformation/models.py

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

moto/cloudformation/parsing.py

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

moto/cloudformation/responses.py

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

moto/cloudformation/urls.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 from .responses import CloudFormationResponse
 
 url_bases = [

moto/cloudformation/utils.py

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

moto/core/__init__.py

@@ -1 +1,2 @@
+from __future__ import unicode_literals
 from .models import BaseBackend

moto/core/models.py

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

moto/core/responses.py

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

moto/core/utils.py

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

moto/dynamodb/__init__.py

@@ -1,2 +1,3 @@
+from __future__ import unicode_literals
 from .models import dynamodb_backend
 mock_dynamodb = dynamodb_backend.decorator

moto/dynamodb/comparisons.py

@@ -1,3 +1,4 @@
+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,3 +1,4 @@
+from __future__ import unicode_literals
 from collections import defaultdict
 import datetime
 import json

moto/dynamodb/responses.py

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

moto/dynamodb/urls.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 from .responses import DynamoHandler
 
 url_bases = [

moto/dynamodb/utils.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 import calendar
 
 

moto/dynamodb2/__init__.py

@@ -1,2 +1,3 @@
+from __future__ import unicode_literals
 from .models import dynamodb_backend2
 mock_dynamodb2 = dynamodb_backend2.decorator

moto/dynamodb2/comparisons.py

@@ -1,3 +1,4 @@
+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/dynamodb2/models.py

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

moto/dynamodb2/responses.py

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

moto/dynamodb2/urls.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 from .responses import DynamoHandler
 
 url_bases = [

moto/dynamodb2/utils.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 import calendar
 
 

moto/ec2/__init__.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 from .models import ec2_backends, ec2_backend
 from ..core.models import MockAWS
 

moto/ec2/exceptions.py

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

moto/ec2/models.py

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

moto/ec2/responses/__init__.py

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

moto/ec2/responses/amazon_dev_pay.py

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

moto/ec2/responses/amis.py

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

moto/ec2/responses/availability_zones_and_regions.py

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

moto/ec2/responses/customer_gateways.py

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

moto/ec2/responses/dhcp_options.py

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

moto/ec2/responses/elastic_block_store.py

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

moto/ec2/responses/elastic_ip_addresses.py

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

moto/ec2/responses/elastic_network_interfaces.py

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

moto/ec2/responses/general.py

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

moto/ec2/responses/instances.py

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

moto/ec2/responses/internet_gateways.py

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

moto/ec2/responses/ip_addresses.py

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

moto/ec2/responses/key_pairs.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 from jinja2 import Template
 from moto.core.responses import BaseResponse
 from moto.ec2.models import ec2_backend
@@ -32,7 +33,7 @@ class KeyPairs(BaseResponse):
 
 
 DESCRIBE_KEY_PAIRS_RESPONSE = """<DescribeKeyPairsResponse xmlns="http://ec2.amazonaws.com/doc/2013-10-15/">
-    <requestId>59dbff89-35bd-4eac-99ed-be587EXAMPLE</requestId> 
+    <requestId>59dbff89-35bd-4eac-99ed-be587EXAMPLE</requestId>
     <keySet>
     {% for keypair in keypairs %}
       <item>
@@ -55,6 +56,6 @@ CREATE_KEY_PAIR_RESPONSE = """<CreateKeyPairResponse xmlns="http://ec2.amazonaws
 
 
 DELETE_KEY_PAIR_RESPONSE = """<DeleteKeyPairResponse xmlns="http://ec2.amazonaws.com/doc/2013-10-15/">
-  <requestId>59dbff89-35bd-4eac-99ed-be587EXAMPLE</requestId> 
+  <requestId>59dbff89-35bd-4eac-99ed-be587EXAMPLE</requestId>
   <return>{{ success }}</return>
 </DeleteKeyPairResponse>"""

moto/ec2/responses/monitoring.py

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

moto/ec2/responses/network_acls.py

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

moto/ec2/responses/placement_groups.py

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

moto/ec2/responses/reserved_instances.py

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

moto/ec2/responses/route_tables.py

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

moto/ec2/responses/security_groups.py

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

moto/ec2/responses/spot_instances.py

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

moto/ec2/responses/subnets.py

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

moto/ec2/responses/tags.py

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

moto/ec2/responses/virtual_private_gateways.py

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

moto/ec2/responses/vm_export.py

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

moto/ec2/responses/vm_import.py

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

moto/ec2/responses/vpc_peering_connections.py

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

moto/ec2/responses/vpcs.py

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

moto/ec2/responses/vpn_connections.py

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

moto/ec2/responses/windows.py

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

moto/ec2/urls.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 from .responses import EC2Response
 
 

moto/ec2/utils.py

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

moto/elb/__init__.py

@@ -1,2 +1,3 @@
+from __future__ import unicode_literals
 from .models import elb_backend
 mock_elb = elb_backend.decorator

moto/elb/models.py

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

moto/elb/responses.py

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

moto/elb/urls.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 from .responses import ELBResponse
 
 url_bases = [

moto/emr/__init__.py

@@ -1,2 +1,3 @@
+from __future__ import unicode_literals
 from .models import emr_backend
 mock_emr = emr_backend.decorator

moto/emr/models.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 from moto.core import BaseBackend
 
 from .utils import random_job_id, random_instance_group_id

moto/emr/responses.py

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

moto/emr/urls.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 from .responses import ElasticMapReduceResponse
 
 url_bases = [

moto/emr/utils.py

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

moto/iam/__init__.py

@@ -1,2 +1,3 @@
+from __future__ import unicode_literals
 from .models import iam_backend
 mock_iam = iam_backend.decorator

moto/iam/models.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 from moto.core import BaseBackend
 
 from .utils import random_resource_id

moto/iam/responses.py

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

moto/iam/urls.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 from .responses import IamResponse
 
 url_bases = [

moto/iam/utils.py

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

moto/route53/__init__.py

@@ -1,2 +1,3 @@
+from __future__ import unicode_literals
 from .models import route53_backend
 mock_route53 = route53_backend.decorator

moto/route53/models.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 from moto.core import BaseBackend
 from moto.core.utils import get_random_hex
 

moto/route53/responses.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 from jinja2 import Template
 from urlparse import parse_qs, urlparse
 from .models import route53_backend

moto/route53/urls.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 import responses
 
 url_bases = [

moto/s3/__init__.py

@@ -1,2 +1,3 @@
+from __future__ import unicode_literals
 from .models import s3_backend
 mock_s3 = s3_backend.decorator

moto/s3/exceptions.py

@@ -1,3 +1,6 @@
+from __future__ import unicode_literals
+
+
 class BucketAlreadyExists(Exception):
     pass
 

moto/s3/models.py

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

moto/s3/responses.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 from urlparse import parse_qs, urlparse
 import re
 

moto/s3/urls.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 from .responses import S3ResponseInstance
 
 url_bases = [

moto/s3/utils.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 import re
 import sys
 import urllib2

moto/s3bucket_path/__init__.py

@@ -1,2 +1,3 @@
+from __future__ import unicode_literals
 from .models import s3bucket_path_backend
 mock_s3bucket_path = s3bucket_path_backend.decorator

moto/s3bucket_path/models.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 from moto.s3.models import S3Backend
 
 

moto/s3bucket_path/responses.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 from .models import s3bucket_path_backend
 
 from .utils import bucket_name_from_url

moto/s3bucket_path/urls.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 from .responses import S3BucketPathResponseInstance as ro
 
 url_bases = [

moto/s3bucket_path/utils.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 import urlparse
 
 

moto/server.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 import re
 import sys
 import argparse

moto/ses/__init__.py

@@ -1,2 +1,3 @@
+from __future__ import unicode_literals
 from .models import ses_backend
 mock_ses = ses_backend.decorator

moto/ses/models.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 from moto.core import BaseBackend
 from .utils import get_random_message_id
 

moto/ses/responses.py

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

moto/ses/urls.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 from .responses import EmailResponse
 
 url_bases = [

moto/ses/utils.py

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

moto/sns/__init__.py

@@ -1,2 +1,3 @@
+from __future__ import unicode_literals
 from .models import sns_backend
 mock_sns = sns_backend.decorator

moto/sns/models.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 import datetime
 import requests
 import uuid