Skip to contentSkip to conversation

docs: Keep up with the location of NoUri

PATCH New Jonathan Corbet 1 participant 1 message Jan 22, 2020

Subsystems (2)
lore
Share & tools
lore

Jonathan Corbet

author maintainer
#0 lore raw

PATCH 1/1 docs: Keep up with the location of NoUri

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.

---
 Documentation/sphinx/automarkup.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
Documentation/sphinx/automarkup.py +6 -1
index 5b6119ff69f4..b18236370742 100644
@@ -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
 
 #
Signature · 1 line
2.24.1