OSDN Git Service

docs: Keep up with the location of NoUri
authorJonathan Corbet <corbet@lwn.net>
Wed, 22 Jan 2020 23:06:28 +0000 (16:06 -0700)
committerJonathan Corbet <corbet@lwn.net>
Fri, 24 Jan 2020 16:47:05 +0000 (09:47 -0700)
commitbcac386f3d3940354e76ab6309e4279134848424
tree97734f6a5fefd94ace846bab15fad3f932b5109d
parent6535a39ffa88d24e7b277737e6a7405181f68710
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.

Signed-off-by: Jonathan Corbet <corbet@lwn.net>
Documentation/sphinx/automarkup.py