From 3b08e981ca2c5e27dbffe8e002293d227d6511f2 Mon Sep 17 00:00:00 2001 From: yumoqing Date: Thu, 9 Apr 2026 23:30:50 +0800 Subject: [PATCH] bugfix --- ahserver/globalEnv.py | 10 +++++++--- ahserver/webapp.py | 10 +++++++--- setup.cfg | 2 +- 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/ahserver/globalEnv.py b/ahserver/globalEnv.py index a42c9c0..2ce96ac 100644 --- a/ahserver/globalEnv.py +++ b/ahserver/globalEnv.py @@ -5,7 +5,10 @@ import sys import codecs from urllib.parse import quote import json -import uvloop +try: + import uvloop +except: + pass import asyncio from contextlib import asynccontextmanager @@ -263,8 +266,9 @@ def background_reco(reco, *args, **kw): def get_loop_type(): loop = asyncio.get_event_loop() - if isinstance(loop, uvloop.Loop): - return 'uvloop.Loop' + if uvloop: + if isinstance(loop, uvloop.Loop): + return 'uvloop.Loop' return str(type(loop)) def initEnv(): diff --git a/ahserver/webapp.py b/ahserver/webapp.py index 7f15c05..58ce643 100644 --- a/ahserver/webapp.py +++ b/ahserver/webapp.py @@ -1,8 +1,12 @@ -import uvloop -uvloop.install() import os, sys -import argparse +try: + import uvloop + if sys.platform != 'win32': + uvloop.install() +except Exception as e: + pass from appPublic.log import MyLogger, info, debug, warning +import argparse from appPublic.folderUtils import ProgramPath from appPublic.jsonConfig import getConfig from ahserver.configuredServer import ConfiguredServer diff --git a/setup.cfg b/setup.cfg index 77c19a3..77868ff 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,7 +1,7 @@ # setup.cfg [metadata] name = ahserver -version = 1.1.4 +version = 1.2.0 description = A application server base on aiohttp author = yu moqing author_email = yumoqing@gmail.com