diff options
author | Takeshi KOMIYA <i.tkomiya@gmail.com> | 2019-07-13 11:14:44 +0900 |
---|---|---|
committer | Takeshi KOMIYA <i.tkomiya@gmail.com> | 2019-07-13 11:14:44 +0900 |
commit | 1d2d295a93db73f9648f016ee7fc0152efdaa9a7 (patch) | |
tree | 17e0aef03ce5108b0145b419d7b7ac495d43131f /sphinx/util/docutils.py | |
parent | 5d89c30dab810117421b6262362b1b45432c9f8e (diff) | |
parent | 68973e803a4a79e54918e9bcbbfae8c535576c70 (diff) | |
download | sphinx-git-1d2d295a93db73f9648f016ee7fc0152efdaa9a7.tar.gz |
Merge branch '2.1.3' into 2.0
Diffstat (limited to 'sphinx/util/docutils.py')
-rw-r--r-- | sphinx/util/docutils.py | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sphinx/util/docutils.py b/sphinx/util/docutils.py index e2513b141..d0300a682 100644 --- a/sphinx/util/docutils.py +++ b/sphinx/util/docutils.py @@ -53,13 +53,13 @@ additional_nodes = set() # type: Set[Type[nodes.Element]] def docutils_namespace() -> Generator[None, None, None]: """Create namespace for reST parsers.""" try: - _directives = copy(directives._directives) # type: ignore - _roles = copy(roles._roles) # type: ignore + _directives = copy(directives._directives) + _roles = copy(roles._roles) yield finally: - directives._directives = _directives # type: ignore - roles._roles = _roles # type: ignore + directives._directives = _directives + roles._roles = _roles for node in list(additional_nodes): unregister_node(node) @@ -68,7 +68,7 @@ def docutils_namespace() -> Generator[None, None, None]: def is_directive_registered(name: str) -> bool: """Check the *name* directive is already registered.""" - return name in directives._directives # type: ignore + return name in directives._directives def register_directive(name: str, directive: Type[Directive]) -> None: @@ -82,7 +82,7 @@ def register_directive(name: str, directive: Type[Directive]) -> None: def is_role_registered(name: str) -> bool: """Check the *name* role is already registered.""" - return name in roles._roles # type: ignore + return name in roles._roles def register_role(name: str, role: RoleFunction) -> None: @@ -96,7 +96,7 @@ def register_role(name: str, role: RoleFunction) -> None: def unregister_role(name: str) -> None: """Unregister a role from docutils.""" - roles._roles.pop(name, None) # type: ignore + roles._roles.pop(name, None) def is_node_registered(node: Type[Element]) -> bool: @@ -111,7 +111,7 @@ def register_node(node: Type[Element]) -> None: inside ``docutils_namespace()`` to prevent side-effects. """ if not hasattr(nodes.GenericNodeVisitor, 'visit_' + node.__name__): - nodes._add_node_class_names([node.__name__]) # type: ignore + nodes._add_node_class_names([node.__name__]) additional_nodes.add(node) |