docs: Keep up with the location of NoUri

Jonathan Corbet · Jonathan Corbet · commit bcac386f3d39 · 2020-01-24T09:47:05.000-07:00
Sphinx 2.1 moved sphinx.environment.NoUri into sphinx.errors; that produced
this warning in the docs build:

  /usr/lib/python3.7/site-packages/sphinx/registry.py:473:
    RemovedInSphinx30Warning: sphinx.environment.NoUri is deprecated.

Grab NoUri from the right place and make the warning go away.  That symbol
was only added to sphinx.errors in 2.1, so we must still import it from the
old location when running in older versions.

Signed-off-by: Jonathan Corbet &lt;corbet@lwn.net&gt;
diff --git a/Documentation/sphinx/automarkup.py b/Documentation/sphinx/automarkup.py
@@ -5,8 +5,13 @@
 # has been done.
 #
 from docutils import nodes
+import sphinx
 from sphinx import addnodes
-from sphinx.environment import NoUri
+if sphinx.version_info[0] < 2 or \
+   sphinx.version_info[0] == 2 and sphinx.version_info[1] < 1:
+    from sphinx.environment import NoUri
+else:
+    from sphinx.errors import NoUri
 import re
 
 #

Original file line number	Diff line number	Diff line change
`@@ -5,8 +5,13 @@`
`5`	`5`	`# has been done.`
`6`	`6`	`#`
`7`	`7`	`from docutils import nodes`
	`8`	`+import sphinx`
`8`	`9`	`from sphinx import addnodes`
`9`		`-from sphinx.environment import NoUri`
	`10`	`+if sphinx.version_info[0] < 2 or \`
	`11`	`+ sphinx.version_info[0] == 2 and sphinx.version_info[1] < 1:`
	`12`	`+ from sphinx.environment import NoUri`
	`13`	`+else:`
	`14`	`+ from sphinx.errors import NoUri`
`10`	`15`	`import re`
`11`	`16`
`12`	`17`	`#`