From 61556e34103c93ca6ce8d29c78002fd763dd19d0 Mon Sep 17 00:00:00 2001 From: Ben Greiner Date: Fri, 4 Dec 2020 20:27:25 +0100 Subject: [PATCH 1/4] Fix AliasNode.copy() --- sphinx/domains/c.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sphinx/domains/c.py b/sphinx/domains/c.py index 5896f4a80..4dc2f22cf 100644 --- a/sphinx/domains/c.py +++ b/sphinx/domains/c.py @@ -3457,7 +3457,8 @@ class AliasNode(nodes.Element): self.parentKey = parentKey def copy(self: T) -> T: - return self.__class__(self.sig, env=None, parentKey=self.parentKey) # type: ignore + return self.__class__(self.sig, self.maxdepth, self.document, + env=None, parentKey=self.parentKey) # type: ignore class AliasTransform(SphinxTransform): From e35639299d735e2b6b28d9c4351988da7c16dd7e Mon Sep 17 00:00:00 2001 From: Ben Greiner Date: Fri, 4 Dec 2020 20:48:02 +0100 Subject: [PATCH 2/4] Fix mypy type error --- sphinx/domains/c.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sphinx/domains/c.py b/sphinx/domains/c.py index 4dc2f22cf..af2e5f8d9 100644 --- a/sphinx/domains/c.py +++ b/sphinx/domains/c.py @@ -3456,9 +3456,9 @@ class AliasNode(nodes.Element): assert parentKey is not None self.parentKey = parentKey - def copy(self: T) -> T: + def copy(self) -> 'AliasNode': return self.__class__(self.sig, self.maxdepth, self.document, - env=None, parentKey=self.parentKey) # type: ignore + env=None, parentKey=self.parentKey) class AliasTransform(SphinxTransform): From b7c7adfd1836e17016fb046ac2879d4701062f10 Mon Sep 17 00:00:00 2001 From: Jakob Lykke Andersen Date: Sat, 12 Dec 2020 17:26:27 +0100 Subject: [PATCH 3/4] C++, typing on AliasNode.copy --- sphinx/domains/cpp.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sphinx/domains/cpp.py b/sphinx/domains/cpp.py index 72d425035..169e77aaa 100644 --- a/sphinx/domains/cpp.py +++ b/sphinx/domains/cpp.py @@ -7055,8 +7055,8 @@ class AliasNode(nodes.Element): assert parentKey is not None self.parentKey = parentKey - def copy(self: T) -> T: - return self.__class__(self.sig, env=None, parentKey=self.parentKey) # type: ignore + def copy(self) -> 'AliasNode': + return self.__class__(self.sig, env=None, parentKey=self.parentKey) class AliasTransform(SphinxTransform): From 43113594aacb329b4c32c15ad739345ad49a4333 Mon Sep 17 00:00:00 2001 From: Jakob Lykke Andersen Date: Sat, 12 Dec 2020 17:27:47 +0100 Subject: [PATCH 4/4] Update CHANGES --- CHANGES | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGES b/CHANGES index d27d3d809..9db4cff55 100644 --- a/CHANGES +++ b/CHANGES @@ -16,6 +16,8 @@ Features added Bugs fixed ---------- +* #8520: C, fix copying of AliasNode. + Testing --------