mirror of
https://github.com/pyscript/pyscript.git
synced 2025-12-19 18:27:29 -05:00
display() should escape by default (#915)
- display(some_str) escapes the string by default. This is almost always what you want
- display(some_obj) calls repr(obj) and escapes the result. Again, it's a very sensible default
- if you want to inject some raw HTML in the output, you can use the new HTML class: display(HTML("<p>hello</p>")).
This commit is contained in:
18
.github/workflows/dashboard.yaml
vendored
18
.github/workflows/dashboard.yaml
vendored
@@ -1,18 +0,0 @@
|
|||||||
name: Push issue to Github Project dashboard
|
|
||||||
|
|
||||||
on:
|
|
||||||
issues:
|
|
||||||
types:
|
|
||||||
- opened
|
|
||||||
pull_request_target:
|
|
||||||
types:
|
|
||||||
- opened
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
add_to_project:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- uses: actions/add-to-project@v0.0.3
|
|
||||||
with:
|
|
||||||
project-url: https://github.com/orgs/pyscript/projects/4/
|
|
||||||
github-token: ${{ secrets.PROJECT_TOKEN }}
|
|
||||||
@@ -1,5 +1,6 @@
|
|||||||
import asyncio
|
import asyncio
|
||||||
import base64
|
import base64
|
||||||
|
import html
|
||||||
import io
|
import io
|
||||||
import time
|
import time
|
||||||
from textwrap import dedent
|
from textwrap import dedent
|
||||||
@@ -35,7 +36,7 @@ def identity(value, meta):
|
|||||||
|
|
||||||
|
|
||||||
MIME_RENDERERS = {
|
MIME_RENDERERS = {
|
||||||
"text/plain": identity,
|
"text/plain": html.escape,
|
||||||
"text/html": identity,
|
"text/html": identity,
|
||||||
"image/png": lambda value, meta: render_image("image/png", value, meta),
|
"image/png": lambda value, meta: render_image("image/png", value, meta),
|
||||||
"image/jpeg": lambda value, meta: render_image("image/jpeg", value, meta),
|
"image/jpeg": lambda value, meta: render_image("image/jpeg", value, meta),
|
||||||
@@ -45,6 +46,18 @@ MIME_RENDERERS = {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
class HTML:
|
||||||
|
"""
|
||||||
|
Wrap a string so that display() can render it as plain HTML
|
||||||
|
"""
|
||||||
|
|
||||||
|
def __init__(self, html):
|
||||||
|
self._html = html
|
||||||
|
|
||||||
|
def _repr_html_(self):
|
||||||
|
return self._html
|
||||||
|
|
||||||
|
|
||||||
def eval_formatter(obj, print_method):
|
def eval_formatter(obj, print_method):
|
||||||
"""
|
"""
|
||||||
Evaluates a formatter method.
|
Evaluates a formatter method.
|
||||||
@@ -68,7 +81,7 @@ def format_mime(obj):
|
|||||||
Formats object using _repr_x_ methods.
|
Formats object using _repr_x_ methods.
|
||||||
"""
|
"""
|
||||||
if isinstance(obj, str):
|
if isinstance(obj, str):
|
||||||
return obj, "text/plain"
|
return html.escape(obj), "text/plain"
|
||||||
|
|
||||||
mimebundle = eval_formatter(obj, "_repr_mimebundle_")
|
mimebundle = eval_formatter(obj, "_repr_mimebundle_")
|
||||||
if isinstance(mimebundle, tuple):
|
if isinstance(mimebundle, tuple):
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
import html
|
||||||
import re
|
import re
|
||||||
|
|
||||||
import pytest
|
import pytest
|
||||||
@@ -201,6 +202,30 @@ class TestOutput(PyScriptTest):
|
|||||||
== "['A', 1, '!']\n{'B': 2, 'List': ['A', 1, '!']}\n('C', 3, '!')"
|
== "['A', 1, '!']\n{'B': 2, 'List': ['A', 1, '!']}\n('C', 3, '!')"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
def test_display_should_escape(self):
|
||||||
|
self.pyscript_run(
|
||||||
|
"""
|
||||||
|
<py-script>
|
||||||
|
display("<p>hello world</p>")
|
||||||
|
</py-script>
|
||||||
|
"""
|
||||||
|
)
|
||||||
|
out = self.page.locator("py-script > div")
|
||||||
|
assert out.inner_html() == html.escape("<p>hello world</p>")
|
||||||
|
assert out.inner_text() == "<p>hello world</p>"
|
||||||
|
|
||||||
|
def test_display_HTML(self):
|
||||||
|
self.pyscript_run(
|
||||||
|
"""
|
||||||
|
<py-script>
|
||||||
|
display(HTML("<p>hello world</p>"))
|
||||||
|
</py-script>
|
||||||
|
"""
|
||||||
|
)
|
||||||
|
out = self.page.locator("py-script > div")
|
||||||
|
assert out.inner_html() == "<p>hello world</p>"
|
||||||
|
assert out.inner_text() == "hello world"
|
||||||
|
|
||||||
def test_image_display(self):
|
def test_image_display(self):
|
||||||
self.pyscript_run(
|
self.pyscript_run(
|
||||||
"""
|
"""
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
import sys
|
||||||
from unittest.mock import Mock
|
from unittest.mock import Mock
|
||||||
|
|
||||||
import pyscript
|
import pyscript
|
||||||
@@ -24,7 +25,26 @@ class TestElement:
|
|||||||
|
|
||||||
def test_format_mime_str():
|
def test_format_mime_str():
|
||||||
obj = "just a string"
|
obj = "just a string"
|
||||||
|
out, mime = pyscript.format_mime(obj)
|
||||||
|
assert out == obj
|
||||||
|
assert mime == "text/plain"
|
||||||
|
|
||||||
res = pyscript.format_mime(obj)
|
|
||||||
assert res[0] == obj
|
def test_format_mime_str_escaping():
|
||||||
assert res[1] == "text/plain"
|
obj = "<p>hello</p>"
|
||||||
|
out, mime = pyscript.format_mime(obj)
|
||||||
|
assert out == "<p>hello</p>"
|
||||||
|
assert mime == "text/plain"
|
||||||
|
|
||||||
|
|
||||||
|
def test_format_mime_repr_escaping():
|
||||||
|
out, mime = pyscript.format_mime(sys)
|
||||||
|
assert out == "<module 'sys' (built-in)>"
|
||||||
|
assert mime == "text/plain"
|
||||||
|
|
||||||
|
|
||||||
|
def test_format_mime_HTML():
|
||||||
|
obj = pyscript.HTML("<p>hello</p>")
|
||||||
|
out, mime = pyscript.format_mime(obj)
|
||||||
|
assert out == "<p>hello</p>"
|
||||||
|
assert mime == "text/html"
|
||||||
|
|||||||
Reference in New Issue
Block a user