From 8d2305df9e0ebba7447aaf79f825dc655e04e628 Mon Sep 17 00:00:00 2001 From: "JHM Darbyshire (iMac)" Date: Mon, 12 Apr 2021 19:07:23 +0200 Subject: [PATCH 1/2] change jinja2 template name to template_html --- doc/source/user_guide/style.ipynb | 2 +- pandas/io/formats/style.py | 2 +- pandas/io/formats/style_render.py | 4 ++-- pandas/tests/io/formats/style/test_style.py | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/doc/source/user_guide/style.ipynb b/doc/source/user_guide/style.ipynb index 8a10a6e4d4c2e..765b2929d3014 100644 --- a/doc/source/user_guide/style.ipynb +++ b/doc/source/user_guide/style.ipynb @@ -1710,7 +1710,7 @@ " Styler.loader, # the default\n", " ])\n", " )\n", - " template = env.get_template(\"myhtml.tpl\")" + " template_html = env.get_template(\"myhtml.tpl\")" ] }, { diff --git a/pandas/io/formats/style.py b/pandas/io/formats/style.py index 7b5347ba2d9a9..91e4413e14e62 100644 --- a/pandas/io/formats/style.py +++ b/pandas/io/formats/style.py @@ -1485,7 +1485,7 @@ def from_custom_template(cls, searchpath, name): # error: Invalid base class "cls" class MyStyler(cls): # type:ignore[valid-type,misc] env = jinja2.Environment(loader=loader) - template = env.get_template(name) + template_html = env.get_template(name) return MyStyler diff --git a/pandas/io/formats/style_render.py b/pandas/io/formats/style_render.py index 82f57b71caebf..9baa0542670e3 100644 --- a/pandas/io/formats/style_render.py +++ b/pandas/io/formats/style_render.py @@ -58,7 +58,7 @@ class StylerRenderer: loader = jinja2.PackageLoader("pandas", "io/formats/templates") env = jinja2.Environment(loader=loader, trim_blocks=True) - template = env.get_template("html.tpl") + template_html = env.get_template("html.tpl") def __init__( self, @@ -143,7 +143,7 @@ def render(self, **kwargs) -> str: # TODO: namespace all the pandas keys d = self._translate() d.update(kwargs) - return self.template.render(**d) + return self.template_html.render(**d) def _compute(self): """ diff --git a/pandas/tests/io/formats/style/test_style.py b/pandas/tests/io/formats/style/test_style.py index 56e9581f8785a..1bb672e06291f 100644 --- a/pandas/tests/io/formats/style/test_style.py +++ b/pandas/tests/io/formats/style/test_style.py @@ -1367,7 +1367,7 @@ def test_block_names(): "tr", "after_rows", } - result = set(Styler.template.blocks) + result = set(Styler.template_html.blocks) assert result == expected @@ -1386,6 +1386,6 @@ def test_from_custom_template(tmpdir): result = Styler.from_custom_template(str(tmpdir.join("templates")), "myhtml.tpl") assert issubclass(result, Styler) assert result.env is not Styler.env - assert result.template is not Styler.template + assert result.template_html is not Styler.template_html styler = result(DataFrame({"A": [1, 2]})) assert styler.render() From a7b93b901dea7c6d03cf607f8778c104f4e30626 Mon Sep 17 00:00:00 2001 From: "JHM Darbyshire (iMac)" Date: Mon, 12 Apr 2021 20:48:34 +0200 Subject: [PATCH 2/2] doc fix --- doc/source/reference/style.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/source/reference/style.rst b/doc/source/reference/style.rst index 90ec5a2283f1e..6eacc90f4f62a 100644 --- a/doc/source/reference/style.rst +++ b/doc/source/reference/style.rst @@ -23,7 +23,7 @@ Styler properties :toctree: api/ Styler.env - Styler.template + Styler.template_html Styler.loader Style application