2019-05-23 10:45:44

by Mauro Carvalho Chehab

[permalink] [raw]
Subject: [PATCH] docs: cdomain.py: get rid of a warning since version 1.8

There's a new warning about a deprecation function. Add a
logic at cdomain.py to avoid that.

Signed-off-by: Mauro Carvalho Chehab <[email protected]>
---
Documentation/sphinx/cdomain.py | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Documentation/sphinx/cdomain.py b/Documentation/sphinx/cdomain.py
index cf13ff3a656c..cbac8e608dc4 100644
--- a/Documentation/sphinx/cdomain.py
+++ b/Documentation/sphinx/cdomain.py
@@ -48,7 +48,10 @@ major, minor, patch = sphinx.version_info[:3]

def setup(app):

- app.override_domain(CDomain)
+ if (major == 1 and minor < 8):
+ app.override_domain(CDomain)
+ else:
+ app.add_domain(CDomain, override=True)

return dict(
version = __version__,
--
2.21.0


2019-05-29 21:51:33

by Jonathan Corbet

[permalink] [raw]
Subject: Re: [PATCH] docs: cdomain.py: get rid of a warning since version 1.8

On Thu, 23 May 2019 07:43:43 -0300
Mauro Carvalho Chehab <[email protected]> wrote:

> There's a new warning about a deprecation function. Add a
> logic at cdomain.py to avoid that.
>
> Signed-off-by: Mauro Carvalho Chehab <[email protected]>

Applied, thanks.

jon