rearrange code

Author: wang0618

pywebio/__init__.py

@@ -9,7 +9,7 @@
 from .exceptions import SessionException, SessionClosedException, SessionNotFoundException
 from .platform import start_server
 from .platform.bokeh import try_install_bokeh_hook
-from .platform.utils import config
+from .platform.page import config
 from .utils import STATIC_PATH
 
 try_install_bokeh_hook()

pywebio/input.py

@@ -80,7 +80,7 @@
 from .io_ctrl import single_input, input_control, output_register_callback, send_msg, single_input_kwargs
 from .session import get_current_session, get_current_task_id
 from .utils import Setter, is_html_safe_value, parse_file_size
-from .platform import utils as platform_setting
+from .platform import page as platform_setting
 
 logger = logging.getLogger(__name__)
 

pywebio/platform/__init__.py

@@ -145,7 +145,7 @@
 """
 
 from .httpbased import run_event_loop
-from .tornado import start_server
-from .utils import seo
-from .utils import config
+from .page import config
+from .page import seo
 from .path_deploy import path_deploy_http, path_deploy
+from .tornado import start_server

pywebio/platform/aiohttp.py

@@ -11,7 +11,8 @@
 
 from .remote_access import start_remote_access_service
 from .tornado import open_webbrowser_on_server_started
-from .utils import make_applications, render_page, cdn_validation, deserialize_binary_event, print_listen_address
+from .page import make_applications, render_page
+from .utils import cdn_validation, deserialize_binary_event, print_listen_address
 from ..session import CoroutineBasedSession, ThreadBasedSession, register_session_implement_for_target, Session
 from ..session.base import get_session_info_from_headers
 from ..utils import get_free_port, STATIC_PATH, iscoroutinefunction, isgeneratorfunction

pywebio/platform/django.py

@@ -5,11 +5,12 @@
 
 from django.http import HttpResponse, HttpRequest
 
-from . import utils
+from . import page
 from ..session import Session
 from .httpbased import HttpContext, HttpHandler, run_event_loop
 from .remote_access import start_remote_access_service
-from .utils import make_applications, cdn_validation
+from .page import make_applications
+from .utils import cdn_validation
 from ..utils import STATIC_PATH, iscoroutinefunction, isgeneratorfunction, get_free_port, parse_file_size
 
 logger = logging.getLogger(__name__)
@@ -122,7 +123,7 @@ def wsgi_app(applications, cdn=True,
     debug = Session.debug = os.environ.get('PYWEBIO_DEBUG', debug)
 
     max_payload_size = parse_file_size(max_payload_size)
-    utils.MAX_PAYLOAD_SIZE = max_payload_size
+    page.MAX_PAYLOAD_SIZE = max_payload_size
 
     django_options.update(dict(
         DEBUG=debug,

pywebio/platform/fastapi.py

@@ -14,7 +14,8 @@
 
 from .remote_access import start_remote_access_service
 from .tornado import open_webbrowser_on_server_started
-from .utils import make_applications, render_page, cdn_validation, OriginChecker, deserialize_binary_event
+from .page import make_applications, render_page
+from .utils import cdn_validation, OriginChecker, deserialize_binary_event
 from ..session import CoroutineBasedSession, ThreadBasedSession, register_session_implement_for_target, Session
 from ..session.base import get_session_info_from_headers
 from ..utils import get_free_port, STATIC_PATH, iscoroutinefunction, isgeneratorfunction, strip_space

pywebio/platform/flask.py

@@ -8,11 +8,12 @@
 
 from flask import Flask, request, send_from_directory, Response
 
-from . import utils
+from . import page
 from ..session import Session
 from .httpbased import HttpContext, HttpHandler, run_event_loop
 from .remote_access import start_remote_access_service
-from .utils import make_applications, cdn_validation
+from .page import make_applications
+from .utils import cdn_validation
 from ..utils import STATIC_PATH, iscoroutinefunction, isgeneratorfunction
 from ..utils import get_free_port, parse_file_size
 
@@ -114,7 +115,7 @@ def wsgi_app(applications, cdn=True,
 
     app = Flask(__name__) if static_dir is None else Flask(__name__, static_url_path="/static",
                                                            static_folder=static_dir)
-    utils.MAX_PAYLOAD_SIZE = app.config['MAX_CONTENT_LENGTH'] = parse_file_size(max_payload_size)
+    page.MAX_PAYLOAD_SIZE = app.config['MAX_CONTENT_LENGTH'] = parse_file_size(max_payload_size)
 
     app.add_url_rule('/', 'webio_view', webio_view(
         applications=applications, cdn=cdn,

pywebio/platform/httpbased.py

@@ -16,7 +16,8 @@
 from contextlib import contextmanager
 from typing import Dict
 
-from .utils import make_applications, render_page, deserialize_binary_event
+from .page import make_applications, render_page
+from .utils import deserialize_binary_event
 from ..session import CoroutineBasedSession, Session, ThreadBasedSession, register_session_implement_for_target
 from ..session.base import get_session_info_from_headers
 from ..utils import random_str, LRUDict, isgeneratorfunction, iscoroutinefunction, check_webio_js