summaryrefslogtreecommitdiff
path: root/sphinx/builders/html.py
diff options
context:
space:
mode:
authorTakeshi KOMIYA <i.tkomiya@gmail.com>2019-03-29 23:52:32 +0900
committerTakeshi KOMIYA <i.tkomiya@gmail.com>2019-03-30 14:50:37 +0900
commit61098a0ae2e696a804459d36bd74ca57db76eda5 (patch)
tree2d71c39d199fec7366a013e0b48c1b2fb4bc83ee /sphinx/builders/html.py
parentc1a254f2491436ac304f1f169aa488438abe4193 (diff)
downloadsphinx-git-61098a0ae2e696a804459d36bd74ca57db76eda5.tar.gz
Drop features and APIs deprecated in 1.8
Diffstat (limited to 'sphinx/builders/html.py')
-rw-r--r--sphinx/builders/html.py49
1 files changed, 2 insertions, 47 deletions
diff --git a/sphinx/builders/html.py b/sphinx/builders/html.py
index 3f167d0d3..5621f9a75 100644
--- a/sphinx/builders/html.py
+++ b/sphinx/builders/html.py
@@ -24,9 +24,7 @@ from docutils.utils import relative_path
from sphinx import package_dir, __display_version__
from sphinx.builders import Builder
-from sphinx.deprecation import (
- RemovedInSphinx30Warning, RemovedInSphinx40Warning, deprecated_alias
-)
+from sphinx.deprecation import RemovedInSphinx40Warning, deprecated_alias
from sphinx.environment.adapters.asset import ImageAdapter
from sphinx.environment.adapters.indexentries import IndexEntries
from sphinx.environment.adapters.toctree import TocTree
@@ -105,39 +103,6 @@ class Stylesheet(str):
return self
-class JSContainer(list):
- """The container for JavaScript scripts."""
- def insert(self, index, obj):
- # type: (int, str) -> None
- warnings.warn('To modify script_files in the theme is deprecated. '
- 'Please insert a <script> tag directly in your theme instead.',
- RemovedInSphinx30Warning, stacklevel=3)
- super().insert(index, obj)
-
- def extend(self, other): # type: ignore
- # type: (List[str]) -> None
- warnings.warn('To modify script_files in the theme is deprecated. '
- 'Please insert a <script> tag directly in your theme instead.',
- RemovedInSphinx30Warning, stacklevel=3)
- for item in other:
- self.append(item)
-
- def __iadd__(self, other): # type: ignore
- # type: (List[str]) -> JSContainer
- warnings.warn('To modify script_files in the theme is deprecated. '
- 'Please insert a <script> tag directly in your theme instead.',
- RemovedInSphinx30Warning, stacklevel=3)
- for item in other:
- self.append(item)
- return self
-
- def __add__(self, other):
- # type: (List[str]) -> JSContainer
- ret = JSContainer(self)
- ret += other
- return ret
-
-
class JavaScript(str):
"""A metadata of javascript file.
@@ -247,7 +212,7 @@ class StandaloneHTMLBuilder(Builder):
self.css_files = [] # type: List[Dict[str, str]]
# JS files
- self.script_files = JSContainer() # type: List[JavaScript]
+ self.script_files = [] # type: List[JavaScript]
def init(self):
# type: () -> None
@@ -1068,16 +1033,6 @@ class StandaloneHTMLBuilder(Builder):
return False
ctx['hasdoc'] = hasdoc
- def warn(*args, **kwargs):
- # type: (Any, Any) -> str
- """Simple warn() wrapper for themes."""
- warnings.warn('The template function warn() was deprecated. '
- 'Use warning() instead.',
- RemovedInSphinx30Warning, stacklevel=2)
- logger.warning(*args, **kwargs)
- return '' # return empty string
- ctx['warn'] = warn
-
ctx['toctree'] = lambda **kw: self._get_local_toctree(pagename, **kw)
self.add_sidebars(pagename, ctx)
ctx.update(addctx)