Merge "Clean imports in code"

doc/source/_exts/atcs.py

@@ -20,14 +20,14 @@ import re
 from docutils import nodes
 from docutils.parsers import rst
 from docutils.parsers.rst import directives
-from docutils.parsers.rst.directives.tables import Table
+from docutils.parsers.rst.directives import tables
 from docutils.statemachine import ViewList
 from sphinx.util.nodes import nested_parse_with_titles
 
 import projects
 
 
-class ExtraATCsTable(Table):
+class ExtraATCsTable(tables.Table):
     """List the extra ATCs for the given project.
     """
 

doc/source/_exts/members.py

@@ -16,7 +16,7 @@
 import re
 
 from docutils import nodes
-from docutils.parsers.rst.directives.tables import Table
+from docutils.parsers.rst.directives import tables
 from docutils.parsers.rst import directives
 
 # Full name (IRC nickname) [expires in] {role}
@@ -39,7 +39,7 @@ def _parse_members_file(app, filename):
             yield m.groupdict()
 
 
-class MembersTable(Table):
+class MembersTable(tables.Table):
     """Insert the members table using the referenced file as source.
     """
 

doc/source/_exts/tags.py

@@ -15,7 +15,7 @@
 
 from docutils import nodes
 from docutils.parsers import rst
-from docutils.statemachine import ViewList
+from docutils import statemachine
 from sphinx.util.nodes import nested_parse_with_titles
 
 import projects
@@ -43,7 +43,7 @@ class TaggedProjectsDirective(rst.Directive):
             return [error]
 
         # Build the view of the data to be parsed for rendering.
-        result = ViewList()
+        result = statemachine.ViewList()
         project_data = _projects_by_tag.get(tagname)
         source_name = '<' + __name__ + '>'
         if not project_data:

doc/source/_exts/teams.py

@@ -15,7 +15,7 @@
 
 from docutils import nodes
 from docutils.parsers import rst
-from docutils.statemachine import ViewList
+from docutils import statemachine
 from sphinx.util.nodes import nested_parse_with_titles
 
 import projects
@@ -124,7 +124,7 @@ class TeamsListDirective(rst.Directive):
         all_teams = projects.get_project_data()
 
         # Build the view of the data to be parsed for rendering.
-        result = ViewList()
+        result = statemachine.ViewList()
         for team_name in sorted(all_teams.keys()):
             team_info = all_teams[team_name]
             for line in _team_to_rst(team_name, team_info):