Merge branch 'issue-945' into develop

* issue-945:
  Add issue to changelog
  Account for LC_CTYPE of UTF-8

CHANGELOG.rst

@@ -17,6 +17,9 @@ Next Release (TBD)
 * feature:``aws elasticache wait``: Add waiters for the
   ``aws elasticache wait``
   (`botocore issue 443 <https://github.com/boto/botocore/pull/443>`__)
+* bugfix:Locale Settings: Fix issue when Mac OS X has an ``LC_CTYPE`` value
+  of ``UTF-8``
+  (`issue 945 <https://github.com/aws/aws-cli/issues/945>`__)
 
 
 1.7.4

bin/aws

@@ -12,6 +12,10 @@
 # ANY KIND, either express or implied. See the License for the specific
 # language governing permissions and limitations under the License.
 import sys
+import os
+
+if os.environ.get('LC_CTYPE', '') == 'UTF-8':
+    os.environ['LC_CTYPE'] = 'en_US.UTF-8'
 import awscli.clidriver
 
 

tests/integration/test_cli.py

@@ -283,6 +283,13 @@ def test_pagination_with_text_output(self):
         p = aws('iam list-users --output text')
         self.assertEqual(p.rc, 0)
 
+    def test_bad_lc_ctype_env_var_is_handled(self):
+        # Test for bad LC_CTYPE on Mac OS X.
+        base_env_vars = os.environ.copy()
+        base_env_vars['LC_CTYPE'] = 'UTF-8'
+        p = aws('iam list-users', env_vars=base_env_vars)
+        self.assertEqual(p.rc, 0)
+
 
 if __name__ == '__main__':
     unittest.main()