Remove deprecated BlockingTrioPortal

newsfragments/1574.removal.rst

@@ -0,0 +1 @@
+Remove ``BlockingTrioPortal``: it was deprecated in 0.12.0.

trio/__init__.py

@@ -54,8 +54,6 @@
     Condition,
 )
 
-from ._threads import BlockingTrioPortal as _BlockingTrioPortal
-
 from ._highlevel_generic import aclose_forcefully, StapledStream
 
 from ._channel import (
@@ -134,9 +132,6 @@
     "current_default_worker_thread_limiter": _deprecate.DeprecatedAttribute(
         to_thread.current_default_thread_limiter, "0.12.0", issue=810,
     ),
-    "BlockingTrioPortal": _deprecate.DeprecatedAttribute(
-        _BlockingTrioPortal, "0.12.0", issue=810, instead=from_thread,
-    ),
     # NOTE: when you remove this, you should also remove the file
     # trio/hazmat.py. For details on why we have both, see:
     #

trio/_threads.py

@@ -21,20 +21,6 @@
 # Global due to Threading API, thread local storage for trio token
 TOKEN_LOCAL = threading.local()
 
-
-class BlockingTrioPortal:
-    def __init__(self, trio_token=None):
-        if trio_token is None:
-            trio_token = trio.lowlevel.current_trio_token()
-        self._trio_token = trio_token
-
-    def run(self, afn, *args):
-        return from_thread_run(afn, *args, trio_token=self._trio_token)
-
-    def run_sync(self, fn, *args):
-        return from_thread_run_sync(fn, *args, trio_token=self._trio_token)
-
-
 _limiter_local = RunVar("limiter")
 # I pulled this number out of the air; it isn't based on anything. Probably we
 # should make some kind of measurements to pick a good value.
@@ -227,10 +213,7 @@ def _run_fn_as_system_task(cb, fn, *args, trio_token=None):
                 "this thread wasn't created by Trio, pass kwarg trio_token=..."
             )
 
-    # TODO: This is only necessary for compatibility with BlockingTrioPortal.
-    # once that is deprecated, this check should no longer be necessary because
-    # thread local storage (or the absence of) is sufficient to check if trio
-    # is running in a thread or not.
+    # Avoid deadlock by making sure we're not called from Trio thread
     try:
         trio.lowlevel.current_task()
     except RuntimeError:

trio/tests/test_exports.py

@@ -33,7 +33,8 @@ def test_core_is_properly_reexported():
 def public_modules(module):
     yield module
     for name, class_ in module.__dict__.items():
-        if name.startswith("_"):
+        # Deprecated classes are exported with a leading underscore
+        if name.startswith("_"):  # pragma: nocover
             continue
         if not isinstance(class_, types.ModuleType):
             continue
@@ -118,7 +119,8 @@ def test_classes_are_final():
         for name, class_ in module.__dict__.items():
             if not isinstance(class_, type):
                 continue
-            if name.startswith("_"):
+            # Deprecated classes are exported with a leading underscore
+            if name.startswith("_"):  # pragma: nocover
                 continue
 
             # Abstract classes can be subclassed, because that's the whole

trio/tests/test_threads.py

@@ -12,7 +12,6 @@
     current_default_thread_limiter,
     from_thread_run,
     from_thread_run_sync,
-    BlockingTrioPortal,
 )
 
 from .._core.tests.test_ki import ki_self
@@ -539,40 +538,10 @@ def test_run_fn_as_system_task_catched_badly_typed_token():
         from_thread_run_sync(_core.current_time, trio_token="Not TrioTokentype")
 
 
-async def test_do_in_trio_thread_from_trio_thread_legacy():
-    # This check specifically confirms that a RuntimeError will be raised if
-    # the old BlockingTrIoPortal API calls into a trio loop while already
-    # running inside of one.
-    portal = BlockingTrioPortal()
+async def test_from_thread_inside_trio_thread():
+    def not_called():  # pragma: no cover
+        assert False
 
+    trio_token = _core.current_trio_token()
     with pytest.raises(RuntimeError):
-        portal.run_sync(lambda: None)  # pragma: no branch
-
-    async def foo():  # pragma: no cover
-        pass
-
-    with pytest.raises(RuntimeError):
-        portal.run(foo)
-
-
-async def test_BlockingTrioPortal_with_explicit_TrioToken():
-    # This tests the deprecated BlockingTrioPortal with a token passed in to
-    # confirm that both methods of making a portal are supported by
-    # trio.from_thread
-    token = _core.current_trio_token()
-
-    def worker_thread(token):
-        with pytest.raises(RuntimeError):
-            BlockingTrioPortal()
-        portal = BlockingTrioPortal(token)
-        return portal.run_sync(threading.current_thread)
-
-    t = await to_thread_run_sync(worker_thread, token)
-    assert t == threading.current_thread()
-
-
-def test_BlockingTrioPortal_deprecated_export(recwarn):
-    import trio
-
-    btp = trio.BlockingTrioPortal
-    assert btp is BlockingTrioPortal
+        from_thread_run_sync(not_called, trio_token=trio_token)