From 88466184245cd43a0176690935172ce2e1bf999d Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sledru@mozilla.com>
Date: Tue, 5 Nov 2019 07:31:08 +0000
Subject: [PATCH] Bug 1593420 - Fix a sphinx warning: sphinx.build_main has
 moved r=ahal

Differential Revision: https://phabricator.services.mozilla.com/D51495

--HG--
extra : moz-landing-system : lando
---
 tools/docs/mach_commands.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/tools/docs/mach_commands.py b/tools/docs/mach_commands.py
index cbcb9dd487f5..09ab90a87de3 100644
--- a/tools/docs/mach_commands.py
+++ b/tools/docs/mach_commands.py
@@ -127,10 +127,9 @@ Bug 1498604 tracks bootstrapping jsdoc properly.
                      open_url_delay=0.1 if auto_open else None)
 
     def _run_sphinx(self, docdir, savedir, config=None, fmt='html', jobs=None):
-        import sphinx
+        import sphinx.cmd.build
         config = config or self.manager.conf_py_path
         args = [
-            'sphinx',
             '-b', fmt,
             '-c', os.path.dirname(config),
             docdir,
@@ -138,7 +137,7 @@ Bug 1498604 tracks bootstrapping jsdoc properly.
         ]
         if jobs:
             args.extend(['-j', jobs])
-        return sphinx.build_main(args)
+        return sphinx.cmd.build.build_main(args)
 
     @property
     def manager(self):