Cleaned up topic code after pr-check script

awscli/clidocs.py

@@ -626,7 +626,7 @@ def _remove_tags_from_content(self, filename):
                 break
 
         # Join all of the non-tagged lines back together.
-        return ''.join(lines[i:])
+        return ''.join(lines[content_begin_index:])
 
     def _line_has_tag(self, line):
         for tag in self._topic_tag_db.valid_tags:

awscli/help.py

@@ -221,7 +221,7 @@ def name(self):
     @property
     def subcommand_table(self):
         """These are the commands that may follow after the help command"""
-        return self._subcommand_table 
+        return self._subcommand_table
 
     @property
     def related_items(self):
@@ -233,8 +233,8 @@ def __call__(self, args, parsed_globals):
             subcommand_parser = ArgTableArgParser({}, self.subcommand_table)
             parsed, remaining = subcommand_parser.parse_known_args(args)
             if getattr(parsed, 'subcommand', None) is not None:
-               return self.subcommand_table[parsed.subcommand](remaining,
-                                                               parsed_globals)
+                return self.subcommand_table[parsed.subcommand](remaining,
+                                                                parsed_globals)
 
         # Create an event handler for a Provider Document
         instance = self.EventHandlerClass(self)

tests/unit/docs/test_help_output.py

@@ -89,7 +89,7 @@ def test_custom_operation_help_output(self):
         self.assert_contains('.. _cli:aws s3 ls:')
         self.assert_contains('List S3 objects')
         self.assert_contains('--summarize')
-    
+
     def test_topic_list_help_output(self):
         self.driver.main(['help', 'topics'])
         # Should contain the title

tests/unit/test_clidocs.py

@@ -21,7 +21,6 @@
     TopicDocumentEventHandler
 from awscli.help import ServiceHelpCommand, TopicListerCommand, \
     TopicHelpCommand
-from awscli.topictags import TopicTagDB
 
 
 class TestRecursiveShapes(unittest.TestCase):
@@ -239,9 +238,9 @@ def test_description(self):
 
     def test_subitems_start(self):
         ref_output = [
-             '-------\nGeneral\n-------',
+            '-------\nGeneral\n-------',
             ('* topic-name-1: %s\n'
-             '* topic-name-3: %s\n' % 
+             '* topic-name-3: %s\n' %
              (self.descriptions[0], self.descriptions[2])),
             '--\nS3\n--',
             '* topic-name-2: %s\n' % self.descriptions[1]
@@ -258,9 +257,9 @@ def test_subitems_start(self):
     def test_subitems_start_html(self):
         self.cmd.doc.target = 'html'
         ref_output = [
-             '-------\nGeneral\n-------',
+            '-------\nGeneral\n-------',
             ('* :ref:`topic-name-1 <cli:aws help topic-name-1>`: %s\n'
-             '* :ref:`topic-name-3 <cli:aws help topic-name-3>`: %s\n' % 
+             '* :ref:`topic-name-3 <cli:aws help topic-name-3>`: %s\n' %
              (self.descriptions[0], self.descriptions[2])),
             '--\nS3\n--',
             ('* :ref:`topic-name-2 <cli:aws help topic-name-2>`: %s\n' %
@@ -269,7 +268,7 @@ def test_subitems_start_html(self):
 
         self.doc_handler.doc_subitems_start(self.cmd)
         contents = self.cmd.doc.getvalue().decode('utf-8')
-        
+
         for line in ref_output:
             self.assertIn(line, contents)
         # Make sure the hidden toctree is in the html

tests/unit/test_help.py

@@ -20,7 +20,6 @@
 from awscli.help import PosixHelpRenderer, ExecutableNotFoundError
 from awscli.help import WindowsHelpRenderer, ProviderHelpCommand, HelpCommand
 from awscli.help import TopicListerCommand, TopicHelpCommand
-from awscli.topictags import TopicTagDB
 
 
 class HelpSpyMixin(object):
@@ -126,6 +125,7 @@ def setUp(self):
     def tearDown(self):
         self.file_creator.remove_all()
 
+
 class TestHelpCommand(TestHelpCommandBase):
     """Test some of the deeper functionality of the HelpCommand