Update dependencies and imports via bcdoc port

README.rst

@@ -335,7 +335,6 @@ Additionally, there are several other packages that are developed in tandem
 with the CLI.  This includes:
 
 * `botocore <https://github.com/boto/botocore>`__
-* `bcdoc <https://github.com/boto/bcdoc>`__
 * `jmespath <https://github.com/boto/jmespath>`__
 
 If you just want to install a snapshot of the latest development version of
@@ -348,15 +347,13 @@ This file points to the development version of the above packages::
 
 However, to keep up to date, you will continually have to run the
 ``pip install -r requirements.txt`` file to pull in the latest changes
-from the develop branches of botocore, bcdoc, etc.
+from the develop branches of botocore, jmespath, etc.
 
 You can optionally clone each of those repositories and run "pip install -e ."
 for each repository::
 
     git clone <jmespath> && cd jmespath/
     pip install -e . && cd ..
-    git clone <bcdoc> && cd bcdoc/
-    pip install -e . &&  cd ..
     git clone <botocore> && cd botocore/
     pip install -e . && cd ..
     git clone <awscli> && cd aws-cli/

awscli/clidocs.py

@@ -12,8 +12,8 @@
 # language governing permissions and limitations under the License.
 import logging
 import os
-from bcdoc.docevents import DOC_EVENTS
 from botocore import xform_name
+from botocore.docs.bcdoc.docevents import DOC_EVENTS
 
 from awscli import SCALAR_TYPES
 from awscli.argprocess import ParamShorthandDocGen

awscli/customizations/commands.py

@@ -1,10 +1,10 @@
 import logging
 import os
 
-import bcdoc.docevents
 from botocore import model
 from botocore.compat import OrderedDict
 from botocore.validate import validate_parameters
+from botocore.docs.bcdoc import docevents
 
 import awscli
 from awscli.argparser import ArgTableArgParser
@@ -355,7 +355,7 @@ def __call__(self, args, parsed_globals):
         # Now generate all of the events for a Provider document.
         # We pass ourselves along so that we can, in turn, get passed
         # to all event handlers.
-        bcdoc.docevents.generate_events(self.session, self)
+        docevents.generate_events(self.session, self)
         self.renderer.render(self.doc.getvalue())
         instance.unregister()
 

awscli/help.py

@@ -19,9 +19,9 @@
 from docutils.core import publish_string
 from docutils.writers import manpage
 
-import bcdoc.docevents
-from bcdoc.restdoc import ReSTDocument
-from bcdoc.textwriter import TextWriter
+from botocore.docs.bcdoc import docevents
+from botocore.docs.bcdoc.restdoc import ReSTDocument
+from botocore.docs.bcdoc.textwriter import TextWriter
 
 from awscli.clidocs import ProviderDocumentEventHandler
 from awscli.clidocs import ServiceDocumentEventHandler
@@ -241,7 +241,7 @@ def __call__(self, args, parsed_globals):
         # Now generate all of the events for a Provider document.
         # We pass ourselves along so that we can, in turn, get passed
         # to all event handlers.
-        bcdoc.docevents.generate_events(self.session, self)
+        docevents.generate_events(self.session, self)
         self.renderer.render(self.doc.getvalue())
         instance.unregister()
 

requirements.txt

@@ -5,7 +5,6 @@ Sphinx==1.1.3
 # in tandem, so we're requiring the latest develop
 # branch of botocore when working on the awscli.
 -e git://github.com/boto/botocore.git@develop#egg=botocore
--e git://github.com/boto/bcdoc.git@develop#egg=bcdoc
 -e git://github.com/boto/jmespath.git@develop#egg=jmespath
 nose==1.3.0
 colorama>=0.2.5,<=0.3.3

setup.py

@@ -7,7 +7,6 @@
 
 
 requires = ['botocore==1.0.0b3',
-            'bcdoc>=0.16.0,<0.17.0',
             'colorama>=0.2.5,<=0.3.3',
             'docutils>=0.10',
             'rsa>=3.1.2,<=3.1.4']