Merge pull request #176 from singingwolfboy/unicode_literals

Unicode literals

tests/__init__.py

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

tests/backport_assert_raises.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 """
 Patch courtesy of:
 https://marmida.com/blog/index.php/2012/08/08/monkey-patching-assert_raises/
@@ -5,14 +6,14 @@ https://marmida.com/blog/index.php/2012/08/08/monkey-patching-assert_raises/
 
 # code for monkey-patching
 import nose.tools
- 
+
 # let's fix nose.tools.assert_raises (which is really unittest.assertRaises)
 # so that it always supports context management
- 
+
 # in order for these changes to be available to other modules, you'll need
 # to guarantee this module is imported by your fixture before either nose or
 # unittest are imported
- 
+
 try:
     nose.tools.assert_raises(Exception)
 except TypeError:
@@ -20,18 +21,18 @@ except TypeError:
     class AssertRaisesContext(object):
         def __init__(self, expected):
             self.expected = expected
- 
+
         def __enter__(self):
             return self
- 
+
         def __exit__(self, exc_type, exc_val, tb):
             self.exception = exc_val
             nose.tools.assert_equal(exc_type, self.expected)
             # if you get to this line, the last assertion must have passed
             # suppress the propagation of this exception
             return True
- 
+
     def assert_raises_context(exc_type):
         return AssertRaisesContext(exc_type)
- 
+
     nose.tools.assert_raises = assert_raises_context

tests/helpers.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 import boto
 from nose.plugins.skip import SkipTest
 

tests/test_autoscaling/test_autoscaling.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 import boto
 from boto.ec2.autoscale.launchconfig import LaunchConfiguration
 from boto.ec2.autoscale.group import AutoScalingGroup

tests/test_autoscaling/test_launch_configurations.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 import boto
 from boto.ec2.autoscale.launchconfig import LaunchConfiguration
 from boto.ec2.blockdevicemapping import BlockDeviceType, BlockDeviceMapping

tests/test_autoscaling/test_policies.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 import boto
 from boto.ec2.autoscale.launchconfig import LaunchConfiguration
 from boto.ec2.autoscale.group import AutoScalingGroup

tests/test_autoscaling/test_server.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 import sure  # noqa
 
 import moto.server as server

tests/test_cloudformation/__init__.py

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

tests/test_cloudformation/fixtures/__init__.py

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

tests/test_cloudformation/fixtures/single_instance_with_ebs_volume.py

@@ -1,3 +1,5 @@
+from __future__ import unicode_literals
+
 template = {
     "Description": "AWS CloudFormation Sample Template Gollum_Single_Instance_With_EBS_Volume: Gollum is a simple wiki system built on top of Git that powers GitHub Wikis. This template installs a Gollum Wiki stack on a single EC2 instance with an EBS volume for storage and demonstrates using the AWS CloudFormation bootstrap scripts to install the packages and files necessary at instance launch time. **WARNING** This template creates an Amazon EC2 instance and an EBS volume. You will be billed for the AWS resources used if you create a stack from this template.",
     "Parameters": {

tests/test_cloudformation/fixtures/vpc_single_instance_in_subnet.py

@@ -1,3 +1,5 @@
+from __future__ import unicode_literals
+
 template = {
     "Description": "AWS CloudFormation Sample Template vpc_single_instance_in_subnet.template: Sample template showing how to create a VPC and add an EC2 instance with an Elastic IP address and a security group. **WARNING** This template creates an Amazon EC2 instance. You will be billed for the AWS resources used if you create a stack from this template.",
     "Parameters": {

tests/test_cloudformation/test_cloudformation_stack_crud.py

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

tests/test_cloudformation/test_cloudformation_stack_integration.py

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

tests/test_cloudformation/test_server.py

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

tests/test_cloudformation/test_stack_parsing.py

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

tests/test_core/test_decorator_calls.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 import boto
 from boto.exception import EC2ResponseError
 import sure  # noqa

tests/test_core/test_instance_metadata.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 import requests
 
 from moto import mock_ec2

tests/test_core/test_nested.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 import unittest
 
 from boto.sqs.connection import SQSConnection
@@ -25,4 +26,4 @@ class TestNestedDecorators(unittest.TestCase):
         self.setup_sqs_queue()
 
         conn = EC2Connection()
-        conn.run_instances('ami-123456')
+        conn.run_instances('ami-123456')

tests/test_core/test_server.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 from mock import patch
 import sure  # noqa
 

tests/test_core/test_url_mapping.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 import sure  # noqa
 
 from moto.core.utils import convert_regex_to_flask_path

tests/test_dynamodb/test_dynamodb.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 import boto
 import sure  # noqa
 import requests

tests/test_dynamodb/test_dynamodb_table_with_range_key.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 import boto
 import sure  # noqa
 from freezegun import freeze_time

tests/test_dynamodb/test_dynamodb_table_without_range_key.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 import boto
 import sure  # noqa
 from freezegun import freeze_time

tests/test_dynamodb/test_server.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 import sure  # noqa
 
 import moto.server as server

tests/test_dynamodb2/test_dynamodb.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 import boto
 import sure  # noqa
 import requests
@@ -13,10 +14,10 @@ except ImportError:
 @requires_boto_gte("2.9")
 @mock_dynamodb2
 def test_list_tables():
-    name = 'TestTable'    
-    #{'schema': }    
+    name = 'TestTable'
+    #{'schema': }
     dynamodb_backend2.create_table(name,schema=[
-        {u'KeyType': u'HASH', u'AttributeName': u'forum_name'}, 
+        {u'KeyType': u'HASH', u'AttributeName': u'forum_name'},
         {u'KeyType': u'RANGE', u'AttributeName': u'subject'}
     ])
     conn =  boto.dynamodb2.connect_to_region(
@@ -39,7 +40,7 @@ def test_list_tables_layer_1():
         'us-west-2',
         aws_access_key_id="ak",
         aws_secret_access_key="sk")
-    
+
     res = conn.list_tables(limit=1)
     expected = {"TableNames": ["test_1"], "LastEvaluatedTableName": "test_1"}
     res.should.equal(expected)

tests/test_dynamodb2/test_dynamodb_table_with_range_key.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 import boto
 import sure  # noqa
 from freezegun import freeze_time

tests/test_dynamodb2/test_dynamodb_table_without_range_key.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 import boto
 import sure  # noqa
 from freezegun import freeze_time

tests/test_dynamodb2/test_server.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 import sure  # noqa
 
 import moto.server as server

tests/test_ec2/test_amazon_dev_pay.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 import boto
 import sure  # noqa
 

tests/test_ec2/test_amis.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 # Ensure 'assert_raises' context manager support for Python 2.6
 import tests.backport_assert_raises
 from nose.tools import assert_raises

tests/test_ec2/test_availability_zones_and_regions.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 import boto
 import sure  # noqa
 

tests/test_ec2/test_customer_gateways.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 import boto
 import sure  # noqa
 

tests/test_ec2/test_dhcp_options.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 # Ensure 'assert_raises' context manager support for Python 2.6
 import tests.backport_assert_raises
 from nose.tools import assert_raises

tests/test_ec2/test_ec2_core.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 import requests
 from moto import mock_ec2
 

tests/test_ec2/test_elastic_block_store.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 # Ensure 'assert_raises' context manager support for Python 2.6
 import tests.backport_assert_raises
 from nose.tools import assert_raises

tests/test_ec2/test_elastic_ip_addresses.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 # Ensure 'assert_raises' context manager support for Python 2.6
 import tests.backport_assert_raises
 from nose.tools import assert_raises

tests/test_ec2/test_elastic_network_interfaces.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 import boto
 import sure  # noqa
 

tests/test_ec2/test_general.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 # Ensure 'assert_raises' context manager support for Python 2.6
 import tests.backport_assert_raises
 from nose.tools import assert_raises

tests/test_ec2/test_instances.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 # Ensure 'assert_raises' context manager support for Python 2.6
 import tests.backport_assert_raises
 from nose.tools import assert_raises

tests/test_ec2/test_internet_gateways.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 # Ensure 'assert_raises' context manager support for Python 2.6
 import tests.backport_assert_raises
 from nose.tools import assert_raises

tests/test_ec2/test_ip_addresses.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 import boto
 import sure  # noqa
 

tests/test_ec2/test_key_pairs.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 # Ensure 'assert_raises' context manager support for Python 2.6
 import tests.backport_assert_raises
 from nose.tools import assert_raises

tests/test_ec2/test_monitoring.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 import boto
 import sure  # noqa
 

tests/test_ec2/test_network_acls.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 import boto
 import sure  # noqa
 

tests/test_ec2/test_placement_groups.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 import boto
 import sure  # noqa
 

tests/test_ec2/test_regions.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 import boto.ec2
 import boto.ec2.autoscale
 import sure
@@ -20,7 +21,7 @@ def test_add_servers_to_a_single_region():
     reservations = conn.get_all_instances()
     len(reservations).should.equal(2)
     reservations.sort(key=lambda x: x.instances[0].image_id)
-    
+
     reservations[0].instances[0].image_id.should.equal('ami-1234abcd')
     reservations[1].instances[0].image_id.should.equal('ami-5678efgh')
 
@@ -39,7 +40,7 @@ def test_add_servers_to_multiple_regions():
 
     len(us_reservations).should.equal(1)
     len(ap_reservations).should.equal(1)
-    
+
     us_reservations[0].instances[0].image_id.should.equal('ami-1234abcd')
     ap_reservations[0].instances[0].image_id.should.equal('ami-5678efgh')
 
@@ -129,4 +130,4 @@ def test_create_autoscaling_group():
     ap_group.health_check_type.should.equal("EC2")
     list(ap_group.load_balancers).should.equal(["ap_test_lb"])
     ap_group.placement_group.should.equal("ap_test_placement")
-    list(ap_group.termination_policies).should.equal(["OldestInstance", "NewestInstance"])
+    list(ap_group.termination_policies).should.equal(["OldestInstance", "NewestInstance"])

tests/test_ec2/test_reserved_instances.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 import boto
 import sure  # noqa
 

tests/test_ec2/test_route_tables.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 import boto
 import sure  # noqa
 

tests/test_ec2/test_security_groups.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 # Ensure 'assert_raises' context manager support for Python 2.6
 import tests.backport_assert_raises
 from nose.tools import assert_raises

tests/test_ec2/test_server.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 import re
 import sure  # noqa
 

tests/test_ec2/test_spot_instances.py

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

tests/test_ec2/test_subnets.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 # Ensure 'assert_raises' context manager support for Python 2.6
 import tests.backport_assert_raises
 from nose.tools import assert_raises

tests/test_ec2/test_tags.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 import itertools
 
 import boto

tests/test_ec2/test_virtual_private_gateways.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 import boto
 import sure  # noqa
 

tests/test_ec2/test_vm_export.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 import boto
 import sure  # noqa
 

tests/test_ec2/test_vm_import.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 import boto
 import sure  # noqa
 

tests/test_ec2/test_vpc_peering.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 # Ensure 'assert_raises' context manager support for Python 2.6
 import tests.backport_assert_raises
 from nose.tools import assert_raises

tests/test_ec2/test_vpcs.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 # Ensure 'assert_raises' context manager support for Python 2.6
 import tests.backport_assert_raises
 from nose.tools import assert_raises

tests/test_ec2/test_vpn_connections.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 import boto
 import sure  # noqa
 

tests/test_ec2/test_windows.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 import boto
 import sure  # noqa
 

tests/test_elb/test_elb.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 import boto
 from boto.ec2.elb import HealthCheck
 import sure  # noqa

tests/test_elb/test_server.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 import sure  # noqa
 
 import moto.server as server

tests/test_emr/test_emr.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 import boto
 from boto.emr.instance_group import InstanceGroup
 from boto.emr.step import StreamingStep

tests/test_emr/test_server.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 import sure  # noqa
 
 import moto.server as server

tests/test_iam/test_iam.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 import boto
 
 import sure  # noqa

tests/test_route53/test_route53.py

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

tests/test_s3/test_s3.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 import urllib2
 from io import BytesIO
 
@@ -59,8 +60,8 @@ def test_multipart_upload_too_small():
     bucket = conn.create_bucket("foobar")
 
     multipart = bucket.initiate_multipart_upload("the-key")
-    multipart.upload_part_from_file(BytesIO('hello'), 1)
-    multipart.upload_part_from_file(BytesIO('world'), 2)
+    multipart.upload_part_from_file(BytesIO(b'hello'), 1)
+    multipart.upload_part_from_file(BytesIO(b'world'), 2)
     # Multipart with total size under 5MB is refused
     multipart.complete_upload.should.throw(S3ResponseError)
 
@@ -71,10 +72,10 @@ def test_multipart_upload():
     bucket = conn.create_bucket("foobar")
 
     multipart = bucket.initiate_multipart_upload("the-key")
-    part1 = '0' * 5242880
+    part1 = b'0' * 5242880
     multipart.upload_part_from_file(BytesIO(part1), 1)
     # last part, can be less than 5 MB
-    part2 = '1'
+    part2 = b'1'
     multipart.upload_part_from_file(BytesIO(part2), 2)
     multipart.complete_upload()
     # we should get both parts as the key contents
@@ -90,7 +91,7 @@ def test_multipart_upload_with_copy_key():
     key.set_contents_from_string("key_value")
 
     multipart = bucket.initiate_multipart_upload("the-key")
-    part1 = '0' * 5242880
+    part1 = b'0' * 5242880
     multipart.upload_part_from_file(BytesIO(part1), 1)
     multipart.copy_part_from_key("foobar", "original-key", 2)
     multipart.complete_upload()
@@ -103,7 +104,7 @@ def test_multipart_upload_cancel():
     bucket = conn.create_bucket("foobar")
 
     multipart = bucket.initiate_multipart_upload("the-key")
-    part1 = '0' * 5242880
+    part1 = b'0' * 5242880
     multipart.upload_part_from_file(BytesIO(part1), 1)
     multipart.cancel_upload()
     # TODO we really need some sort of assertion here, but we don't currently
@@ -117,10 +118,10 @@ def test_multipart_etag():
     bucket = conn.create_bucket('mybucket')
 
     multipart = bucket.initiate_multipart_upload("the-key")
-    part1 = '0' * 5242880
+    part1 = b'0' * 5242880
     multipart.upload_part_from_file(BytesIO(part1), 1)
     # last part, can be less than 5 MB
-    part2 = '1'
+    part2 = b'1'
     multipart.upload_part_from_file(BytesIO(part2), 2)
     multipart.complete_upload()
     # we should get both parts as the key contents

tests/test_s3/test_s3_utils.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 from sure import expect
 from moto.s3.utils import bucket_name_from_url, _VersionedKeyStore
 

tests/test_s3/test_server.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 import sure  # noqa
 
 import moto.server as server

tests/test_s3bucket_path/test_bucket_path_server.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 import sure  # noqa
 
 import moto.server as server

tests/test_s3bucket_path/test_s3bucket_path.py

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

tests/test_s3bucket_path/test_s3bucket_path_utils.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 from sure import expect
 from moto.s3bucket_path.utils import bucket_name_from_url
 

tests/test_ses/test_server.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 import sure  # noqa
 
 import moto.server as server

tests/test_ses/test_ses.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 import email
 
 import boto
@@ -54,7 +55,7 @@ def test_send_email():
     send_quota = conn.get_send_quota()
     sent_count = int(send_quota['GetSendQuotaResponse']['GetSendQuotaResult']['SentLast24Hours'])
     sent_count.should.equal(1)
-    
+
 @mock_ses
 def test_send_html_email():
     conn = boto.connect_ses('the_key', 'the_secret')

tests/test_sns/test_publishing.py

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

tests/test_sns/test_server.py

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

tests/test_sns/test_subscriptions.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 import boto
 
 import sure  # noqa

tests/test_sns/test_topics.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 import boto
 
 import sure  # noqa
@@ -44,9 +45,10 @@ def test_topic_attributes():
     attributes["DeliveryPolicy"].should.equal("")
     attributes["EffectiveDeliveryPolicy"].should.equal(DEFAULT_EFFECTIVE_DELIVERY_POLICY)
 
-    conn.set_topic_attributes(topic_arn, "Policy", {"foo": "bar"})
+    # boto can't handle unicode here :(
+    conn.set_topic_attributes(topic_arn, "Policy", {b"foo": b"bar"})
     conn.set_topic_attributes(topic_arn, "DisplayName", "My display name")
-    conn.set_topic_attributes(topic_arn, "DeliveryPolicy", {"http": {"defaultHealthyRetryPolicy": {"numRetries": 5}}})
+    conn.set_topic_attributes(topic_arn, "DeliveryPolicy", {b"http": {b"defaultHealthyRetryPolicy": {b"numRetries": 5}}})
 
     attributes = conn.get_topic_attributes(topic_arn)['GetTopicAttributesResponse']['GetTopicAttributesResult']['Attributes']
     attributes["Policy"].should.equal("{'foo': 'bar'}")

tests/test_sqs/test_server.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 import re
 import sure  # noqa
 

tests/test_sqs/test_sqs.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 import boto
 from boto.exception import SQSError
 from boto.sqs.message import RawMessage

tests/test_sts/test_server.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 import sure  # noqa
 
 import moto.server as server

tests/test_sts/test_sts.py

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