Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Decode list arguments to unicode #712

Closed
wants to merge 3 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions awscli/argparser.py
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,14 @@ def parse_known_args(self, args, namespace=None):
for arg, value in vars(parsed).items():
if isinstance(value, six.binary_type):
setattr(parsed, arg, value.decode(terminal_encoding))
elif isinstance(value, list):
encoded = []
for v in value:
if isinstance(value, six.binary_type):
encoded.append(v.decode(terminal_encoding))
else:
encoded.append(v)
setattr(parsed, arg, encoded)
return parsed, remaining


Expand Down
43 changes: 43 additions & 0 deletions tests/unit/ec2/test_create_tags.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
#!/usr/bin/env python
# Copyright 2012-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License"). You
# may not use this file except in compliance with the License. A copy of
# the License is located at
#
# http://aws.amazon.com/apache2.0/
#
# or in the "license" file accompanying this file. This file is
# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
# ANY KIND, either express or implied. See the License for the specific
# language governing permissions and limitations under the License.
import sys

import six
from tests import unittest
from tests.unit import BaseAWSCommandParamsTest


class TestCreateTags(BaseAWSCommandParamsTest):

prefix = 'ec2 create-tags'

def test_create_tag_normal(self):
cmdline = self.prefix
cmdline += ' --resources i-12345678 --tags Key=Name,Value=bar'
result = {'ResourceId.1': 'i-12345678', 'Tag.1.Key': 'Name',
'Tag.1.Value': 'bar'}
self.assert_params_for_cmd(cmdline, result)

@unittest.skipIf(
six.PY3, 'Unicode cmd line test only is relevant to python2.')
def test_create_tag_unicode(self):
cmdline = self.prefix
cmdline += u' --resources i-12345678 --tags Key=Name,Value=\u6211'
encoding = getattr(sys.stdin, 'encoding', 'utf-8')
if encoding is None:
encoding = 'utf-8'
cmdline = cmdline.encode(encoding)
result = {'ResourceId.1': 'i-12345678', 'Tag.1.Key': 'Name',
'Tag.1.Value': u'\u6211'}
self.assert_params_for_cmd(cmdline, result)