diff options
| author | Takeshi KOMIYA <i.tkomiya@gmail.com> | 2018-12-16 00:32:10 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-16 00:32:10 +0900 |
| commit | c70e65fc6cd04d02df4f7911025f534dbd27cc20 (patch) | |
| tree | 1e8614ac5516dace99ef1df4d203081662c7c2d6 /sphinx/deprecation.py | |
| parent | d6d4406ce987cc8823d1b3a33be3a418bcd2a59d (diff) | |
| parent | 79eec90f36f5a74e24cfd6740126396fd6567e07 (diff) | |
| download | sphinx-git-c70e65fc6cd04d02df4f7911025f534dbd27cc20.tar.gz | |
Merge branch 'master' into 5770_doctest_refers_highlight_language
Diffstat (limited to 'sphinx/deprecation.py')
| -rw-r--r-- | sphinx/deprecation.py | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/sphinx/deprecation.py b/sphinx/deprecation.py index ebf053e7b..ce84f56f5 100644 --- a/sphinx/deprecation.py +++ b/sphinx/deprecation.py @@ -13,9 +13,7 @@ import warnings if False: # For type annotation - # note: Don't use typing.TYPE_CHECK here (for py27 and py34). from typing import Any, Dict, Type # NOQA - from sphinx.util.typing import unicode # NOQA class RemovedInSphinx30Warning(PendingDeprecationWarning): @@ -39,22 +37,22 @@ class DeprecatedDict(dict): super(DeprecatedDict, self).__init__(data) def __setitem__(self, key, value): - # type: (unicode, Any) -> None + # type: (str, Any) -> None warnings.warn(self.message, self.warning, stacklevel=2) super(DeprecatedDict, self).__setitem__(key, value) def setdefault(self, key, default=None): - # type: (unicode, Any) -> None + # type: (str, Any) -> None warnings.warn(self.message, self.warning, stacklevel=2) return super(DeprecatedDict, self).setdefault(key, default) def __getitem__(self, key): - # type: (unicode) -> None + # type: (str) -> None warnings.warn(self.message, self.warning, stacklevel=2) return super(DeprecatedDict, self).__getitem__(key) def get(self, key, default=None): - # type: (unicode, Any) -> None + # type: (str, Any) -> None warnings.warn(self.message, self.warning, stacklevel=2) return super(DeprecatedDict, self).get(key, default) |