Ver Fonte

expose functions & exceptions in top modules

wangweimin há 5 anos atrás
pai
commit
9e69a17c44
3 ficheiros alterados com 15 adições e 7 exclusões
  1. 9 1
      pywebio/__init__.py
  2. 4 4
      pywebio/session/__init__.py
  3. 2 2
      pywebio/session/asyncbased.py

+ 9 - 1
pywebio/__init__.py

@@ -8,7 +8,15 @@
 version = "0.1.0"
 version_info = (0, 1, 0, 0)
 
-
+from .platform import start_server
+from . import input
+from . import output
+from .session import (
+    set_session_implement, run_async, run_asyncio_coroutine, register_thread,
+    ThreadBasedWebIOSession, AsyncBasedSession
+)
+from .exceptions import SessionException, SessionClosedException, SessionNotFoundException
+from .utils import STATIC_PATH
 
 # Set default logging handler to avoid "No handler found" warnings.
 import logging

+ 4 - 4
pywebio/session/__init__.py

@@ -8,7 +8,7 @@ from ..exceptions import SessionNotFoundException
 
 _session_type = ThreadBasedWebIOSession
 
-__all__ = ['set_session_implement', 'run_async', 'asyncio_coroutine', 'register_thread']
+__all__ = ['set_session_implement', 'run_async', 'run_asyncio_coroutine', 'register_thread']
 
 _server_started = False
 
@@ -89,12 +89,12 @@ def run_async(coro_obj):
 
 
 @check_session_impl(AsyncBasedSession)
-async def asyncio_coroutine(coro):
-    """若会话线程和运行事件的线程不是同一个线程,需要用 asyncio_coroutine 来运行asyncio中的协程
+async def run_asyncio_coroutine(coro_obj):
+    """若会话线程和运行事件的线程不是同一个线程,需要用 run_asyncio_coroutine 来运行asyncio中的协程
 
     :param coro_obj: 协程对象
     """
-    return await AsyncBasedSession.get_current_session().asyncio_coroutine(coro)
+    return await AsyncBasedSession.get_current_session().run_asyncio_coroutine(coro_obj)
 
 
 @check_session_impl(ThreadBasedWebIOSession)

+ 2 - 2
pywebio/session/asyncbased.py

@@ -196,9 +196,9 @@ class AsyncBasedSession(AbstractSession):
     def run_async(self, coro_obj):
         self.inactive_coro_instances.append(coro_obj)
 
-    async def asyncio_coroutine(self, coro):
+    async def run_asyncio_coroutine(self, coro_obj):
         """若会话线程和运行事件的线程不是同一个线程,需要用 asyncio_coroutine 来运行asyncio中的协程"""
-        res = await WebIOFuture(coro=coro)
+        res = await WebIOFuture(coro=coro_obj)
         return res