Skip to content

Commit 1159d1e

Browse files
committed
Merge followup
1 parent 6e2ca05 commit 1159d1e

File tree

5 files changed

+14
-9
lines changed

5 files changed

+14
-9
lines changed

shiny/render/_display.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ async def render(self) -> JsonifiableDict | None:
100100
if len(results) == 0:
101101
return None
102102

103-
session = require_active_session(None)
103+
session = require_active_session()
104104
return rendered_deps_to_jsonifiable(
105105
session._process_ui(
106106
TagList(*results) # pyright: ignore[reportGeneralTypeIssues]

shiny/render/_render.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,7 @@ def __init__(
274274
async def render(self) -> dict[str, Jsonifiable] | Jsonifiable | None:
275275
is_userfn_async = self.fn.is_async()
276276
name = self.output_id
277-
session = require_active_session(None)
277+
session = require_active_session()
278278
width = self.width
279279
height = self.height
280280
alt = self.alt
@@ -586,7 +586,7 @@ def auto_output_ui(self) -> Tag:
586586
return _ui.output_ui(self.output_id)
587587

588588
async def transform(self, value: TagChild) -> Jsonifiable:
589-
session = require_active_session(None)
589+
session = require_active_session()
590590
return rendered_deps_to_jsonifiable(
591591
session._process_ui(value),
592592
)
@@ -664,7 +664,7 @@ def __call__( # pyright: ignore[reportIncompatibleMethodOverride]
664664
def url() -> str:
665665
from urllib.parse import quote
666666

667-
session = require_active_session(None)
667+
session = require_active_session()
668668
return f"session/{quote(session.id)}/download/{quote(self.output_id)}?w="
669669

670670
# Unlike most value functions, this one's name is `url`. But we want to get the

shiny/render/renderer/_renderer.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ class Renderer(Generic[IT]):
119119
120120
This value **will not** contain a module prefix (or session name-spacing). To get
121121
the fully resolved ID, call
122-
`shiny.session.require_active_session(None).ns(self.output_id)`.
122+
`shiny.session.require_active_session().ns(self.output_id)`.
123123
124124
An initial value of `.__name__` (set within `Renderer.__call__(_fn)`) will be used until the
125125
output renderer is registered within the session.
@@ -266,7 +266,7 @@ def _on_register(self) -> None:
266266
# (w/ module support)
267267
from ...session import require_active_session
268268

269-
session = require_active_session(None)
269+
session = require_active_session()
270270
ns_name = session.output._ns(self.__name__)
271271
session.output.remove(ns_name)
272272
self._auto_registered = False

shiny/render/transformer/_transformer.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@ def _meta(self) -> TransformerMetadata:
276276
"""
277277
from ...session import require_active_session
278278

279-
session = require_active_session(None)
279+
session = require_active_session()
280280
return TransformerMetadata(
281281
session=session,
282282
name=self.output_id,

tests/playwright/examples/example_apps.py

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,11 @@ def get_apps(path: str) -> typing.List[str]:
4747
"ShinyDeprecationWarning:",
4848
"shiny.render.transformer.output_transformer()",
4949
]
50+
session_warnings = [
51+
# shinywidgets.register_widget() uses `session` when registering widget
52+
"ShinyDeprecationWarning: `session=` is deprecated",
53+
"session_type_warning()", # continutation of line above
54+
]
5055
express_warnings = ["Detected Shiny Express app. "]
5156
app_allow_shiny_errors: typing.Dict[
5257
str, typing.Union[Literal[True], typing.List[str]]
@@ -60,8 +65,8 @@ def get_apps(path: str) -> typing.List[str]:
6065
"UserWarning: This figure includes Axes that are not compatible with tight_layout",
6166
],
6267
# Remove after shinywidgets accepts `Renderer` PR
63-
"airmass": [*output_transformer_errors],
64-
"brownian": [*output_transformer_errors],
68+
"airmass": [*output_transformer_errors, *session_warnings],
69+
"brownian": [*output_transformer_errors, *session_warnings],
6570
"multi-page": [*output_transformer_errors],
6671
"model-score": [*output_transformer_errors],
6772
"data_frame": [*output_transformer_errors],

0 commit comments

Comments
 (0)