Skip to content

Commit 3d50141

Browse files
committed
Remove Starlette log from __init__ and add a delayed log to Client.
1 parent 63c55c2 commit 3d50141

File tree

2 files changed

+9
-14
lines changed

2 files changed

+9
-14
lines changed

twitchio/client.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
from .payloads import EventErrorPayload, WebsocketSubscriptionData
4747
from .user import ActiveExtensions, Extension, PartialUser, User
4848
from .utils import MISSING, EventWaiter, clamp, unwrap_function
49-
from .web import AiohttpAdapter
49+
from .web import AiohttpAdapter, has_starlette
5050
from .web.utils import BaseAdapter
5151

5252

@@ -145,6 +145,10 @@ def __init__(
145145
session=session,
146146
client=self,
147147
)
148+
if not has_starlette:
149+
msg = "If you require the StarletteAdapter please install the required packages: 'pip install twitchio[starlette]'."
150+
logger.warning(msg)
151+
148152
adapter: BaseAdapter | type[BaseAdapter] = options.get("adapter", AiohttpAdapter)
149153
if isinstance(adapter, BaseAdapter):
150154
adapter.client = self

twitchio/web/__init__.py

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -24,24 +24,15 @@
2424

2525
from __future__ import annotations
2626

27-
import logging
28-
29-
from ..utils import ColorFormatter
3027
from .aio_adapter import AiohttpAdapter as AiohttpAdapter
3128
from .utils import BaseAdapter as BaseAdapter, FetchTokenPayload as FetchTokenPayload
3229

3330

34-
handler = logging.StreamHandler()
35-
handler.setFormatter(ColorFormatter())
36-
logger = logging.getLogger(__name__)
37-
logger.addHandler(handler)
38-
31+
has_starlette = False
3932

4033
try:
4134
from .starlette_adapter import StarletteAdapter as StarletteAdapter
4235
except ImportError:
43-
msg = "If you require the StarletteAdapter please install the required packages: 'pip install twitchio[starlette]'."
44-
logger.warning("Starlette or uvicorn is not installed, StarletteAdapter support will not be available. %s", msg)
45-
46-
47-
logger.removeHandler(handler)
36+
has_starlette = False
37+
else:
38+
has_starlette = True

0 commit comments

Comments
 (0)