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

Fix regression when parsing number types in shorthand #693

Merged
merged 1 commit into from
Mar 6, 2014
Merged
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
4 changes: 2 additions & 2 deletions awscli/argprocess.py
Original file line number Diff line number Diff line change
Expand Up @@ -162,8 +162,8 @@ def get_parse_method_for_param(self, param, value=None):
if isinstance(value, list):
check_val = value[0]
else:
check_val = value.strip()
if isinstance(check_val, six.string_types) and check_val.startswith(
check_val = value
if isinstance(check_val, six.string_types) and check_val.strip().startswith(
('[', '{')):
LOG.debug("Param %s looks like JSON, not considered for "
"param shorthand.", param.py_name)
Expand Down
27 changes: 27 additions & 0 deletions tests/unit/rds/test_describe_db_log_files.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
#!/usr/bin/env python
# Copyright 2014 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.
from tests.unit import BaseAWSCommandParamsTest


class TestDescribeDBLogFiles(BaseAWSCommandParamsTest):
maxDiff = None
prefix = 'rds describe-db-log-files '

def test_add_option(self):
args = ('--file-last-written 10 '
'--db-instance-identifier foo')
cmdline = self.prefix + args
result = {'DBInstanceIdentifier': 'foo',
'FileLastWritten': '10'}
self.assert_params_for_cmd(cmdline, result)