Merge pull request awslabs#250 from joguSD/latest-cli

Update to support the latest aws-cli

Author: joguSD

.travis.yml

@@ -2,14 +2,10 @@ language: python
 
 matrix:
     include:
-        - python: 2.6
-          env: TEST_TYPE=test
         - python: 2.7
           env: TEST_TYPE=test
         - python: 2.7
           env: TEST_TYPE=check
-        - python: 3.3
-          env: TEST_TYPE=test
         - python: 3.4
           env: TEST_TYPE=test
         - python: 3.5

awsshell/makeindex.py

@@ -5,9 +5,12 @@
 
 from six import BytesIO
 from docutils.core import publish_string
-from botocore.docs.bcdoc import textwriter
 import awscli.clidriver
 from awscli.argprocess import ParamShorthandDocGen
+try:
+    from botocore.docs.bcdoc import textwriter
+except ImportError:
+    from awscli.bcdoc import textwriter
 
 from awsshell import determine_doc_index_filename
 from awsshell.utils import remove_html