Skip to content

Commit 52c02a2

Browse files
rowilliagvanrossum
rowillia
authored and
gvanrossum
committed
Allow Any type to be acceptable for the msg parameter in `logging.{info, warn, error, ...} (#1776)
The stdlib accepts any value here as long as it is castable to a string: https://github.com/python/cpython/blob/3.6/Lib/logging/__init__.py#L336 https://github.com/python/cpython/blob/2.7/Lib/logging/__init__.py#L319-L330 Ideally this would use Protocols but I don't see them in use in typeshed yet.
1 parent a753aba commit 52c02a2

File tree

1 file changed

+51
-51
lines changed

1 file changed

+51
-51
lines changed

‎stdlib/2and3/logging/__init__.pyi

Lines changed: 51 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -48,54 +48,54 @@ class Logger(Filterer):
4848
def getEffectiveLevel(self) -> int: ...
4949
def getChild(self, suffix: str) -> 'Logger': ...
5050
if sys.version_info >= (3,):
51-
def debug(self, msg: Text, *args: Any, exc_info: _ExcInfoType = ...,
51+
def debug(self, msg: Any, *args: Any, exc_info: _ExcInfoType = ...,
5252
stack_info: bool = ..., extra: Optional[Dict[str, Any]] = ...,
5353
**kwargs: Any) -> None: ...
54-
def info(self, msg: Text, *args: Any, exc_info: _ExcInfoType = ...,
54+
def info(self, msg: Any, *args: Any, exc_info: _ExcInfoType = ...,
5555
stack_info: bool = ..., extra: Optional[Dict[str, Any]] = ...,
5656
**kwargs: Any) -> None: ...
57-
def warning(self, msg: Text, *args: Any, exc_info: _ExcInfoType = ...,
57+
def warning(self, msg: Any, *args: Any, exc_info: _ExcInfoType = ...,
5858
stack_info: bool = ..., extra: Optional[Dict[str, Any]] = ...,
5959
**kwargs: Any) -> None: ...
60-
def warn(self, msg: Text, *args: Any, exc_info: _ExcInfoType = ...,
60+
def warn(self, msg: Any, *args: Any, exc_info: _ExcInfoType = ...,
6161
stack_info: bool = ..., extra: Optional[Dict[str, Any]] = ...,
6262
**kwargs: Any) -> None: ...
63-
def error(self, msg: Text, *args: Any, exc_info: _ExcInfoType = ...,
63+
def error(self, msg: Any, *args: Any, exc_info: _ExcInfoType = ...,
6464
stack_info: bool = ..., extra: Optional[Dict[str, Any]] = ...,
6565
**kwargs: Any) -> None: ...
66-
def critical(self, msg: Text, *args: Any, exc_info: _ExcInfoType = ...,
66+
def critical(self, msg: Any, *args: Any, exc_info: _ExcInfoType = ...,
6767
stack_info: bool = ..., extra: Optional[Dict[str, Any]] = ...,
6868
**kwargs: Any) -> None: ...
69-
def log(self, lvl: int, msg: Text, *args: Any, exc_info: _ExcInfoType = ...,
69+
def log(self, lvl: int, msg: Any, *args: Any, exc_info: _ExcInfoType = ...,
7070
stack_info: bool = ..., extra: Optional[Dict[str, Any]] = ...,
7171
**kwargs: Any) -> None: ...
72-
def exception(self, msg: Text, *args: Any, exc_info: _ExcInfoType = ...,
72+
def exception(self, msg: Any, *args: Any, exc_info: _ExcInfoType = ...,
7373
stack_info: bool = ..., extra: Optional[Dict[str, Any]] = ...,
7474
**kwargs: Any) -> None: ...
7575
else:
7676
def debug(self,
77-
msg: Text, *args: Any, exc_info: _ExcInfoType = ...,
77+
msg: Any, *args: Any, exc_info: _ExcInfoType = ...,
7878
extra: Optional[Dict[str, Any]] = ..., **kwargs: Any) -> None: ...
7979
def info(self,
80-
msg: Text, *args: Any, exc_info: _ExcInfoType = ...,
80+
msg: Any, *args: Any, exc_info: _ExcInfoType = ...,
8181
extra: Optional[Dict[str, Any]] = ..., **kwargs: Any) -> None: ...
8282
def warning(self,
83-
msg: Text, *args: Any, exc_info: _ExcInfoType = ...,
83+
msg: Any, *args: Any, exc_info: _ExcInfoType = ...,
8484
extra: Optional[Dict[str, Any]] = ..., **kwargs: Any) -> None: ...
8585
def warn(self,
86-
msg: Text, *args: Any, exc_info: _ExcInfoType = ...,
86+
msg: Any, *args: Any, exc_info: _ExcInfoType = ...,
8787
extra: Optional[Dict[str, Any]] = ..., **kwargs: Any) -> None: ...
8888
def error(self,
89-
msg: Text, *args: Any, exc_info: _ExcInfoType = ...,
89+
msg: Any, *args: Any, exc_info: _ExcInfoType = ...,
9090
extra: Optional[Dict[str, Any]] = ..., **kwargs: Any) -> None: ...
9191
def critical(self,
92-
msg: Text, *args: Any, exc_info: _ExcInfoType = ...,
92+
msg: Any, *args: Any, exc_info: _ExcInfoType = ...,
9393
extra: Optional[Dict[str, Any]] = ..., **kwargs: Any) -> None: ...
9494
def log(self,
95-
lvl: int, msg: Text, *args: Any, exc_info: _ExcInfoType = ...,
95+
lvl: int, msg: Any, *args: Any, exc_info: _ExcInfoType = ...,
9696
extra: Optional[Dict[str, Any]] = ..., **kwargs: Any) -> None: ...
9797
def exception(self,
98-
msg: Text, *args: Any, exc_info: _ExcInfoType = ...,
98+
msg: Any, *args: Any, exc_info: _ExcInfoType = ...,
9999
extra: Optional[Dict[str, Any]] = ..., **kwargs: Any) -> None: ...
100100
def addFilter(self, filt: _FilterType) -> None: ...
101101
def removeFilter(self, filt: _FilterType) -> None: ...
@@ -108,15 +108,15 @@ class Logger(Filterer):
108108
def findCaller(self) -> Tuple[str, int, str]: ...
109109
def handle(self, record: 'LogRecord') -> None: ...
110110
if sys.version_info >= (3,):
111-
def makeRecord(self, name: str, lvl: int, fn: str, lno: int, msg: Text,
111+
def makeRecord(self, name: str, lvl: int, fn: str, lno: int, msg: Any,
112112
args: Mapping[str, Any],
113113
exc_info: Optional[_SysExcInfoType],
114114
func: Optional[str] = ...,
115115
extra: Optional[Mapping[str, Any]] = ...,
116116
sinfo: Optional[str] = ...) -> LogRecord: ...
117117
else:
118118
def makeRecord(self,
119-
name: str, lvl: int, fn: str, lno: int, msg: Text,
119+
name: str, lvl: int, fn: str, lno: int, msg: Any,
120120
args: Mapping[str, Any],
121121
exc_info: Optional[_SysExcInfoType],
122122
func: Optional[str] = ...,
@@ -211,65 +211,65 @@ class LogRecord:
211211
threadName = ... # type: str
212212
if sys.version_info >= (3,):
213213
def __init__(self, name: str, level: int, pathname: str, lineno: int,
214-
msg: Text, args: _ArgsType,
214+
msg: Any, args: _ArgsType,
215215
exc_info: Optional[_SysExcInfoType],
216216
func: Optional[str] = ...,
217217
sinfo: Optional[str] = ...) -> None: ...
218218
else:
219219
def __init__(self,
220220
name: str, level: int, pathname: str, lineno: int,
221-
msg: Text, args: _ArgsType,
221+
msg: Any, args: _ArgsType,
222222
exc_info: Optional[_SysExcInfoType],
223223
func: Optional[str] = ...) -> None: ...
224224
def getMessage(self) -> str: ...
225225

226226

227227
class LoggerAdapter:
228228
def __init__(self, logger: Logger, extra: Mapping[str, Any]) -> None: ...
229-
def process(self, msg: Text, kwargs: MutableMapping[str, Any]) -> Tuple[Text, MutableMapping[str, Any]]: ...
229+
def process(self, msg: Any, kwargs: MutableMapping[str, Any]) -> Tuple[Any, MutableMapping[str, Any]]: ...
230230
if sys.version_info >= (3,):
231-
def debug(self, msg: Text, *args: Any, exc_info: _ExcInfoType = ...,
231+
def debug(self, msg: Any, *args: Any, exc_info: _ExcInfoType = ...,
232232
stack_info: bool = ..., extra: Optional[Dict[str, Any]] = ...,
233233
**kwargs: Any) -> None: ...
234-
def info(self, msg: Text, *args: Any, exc_info: _ExcInfoType = ...,
234+
def info(self, msg: Any, *args: Any, exc_info: _ExcInfoType = ...,
235235
stack_info: bool = ..., extra: Optional[Dict[str, Any]] = ...,
236236
**kwargs: Any) -> None: ...
237-
def warning(self, msg: Text, *args: Any, exc_info: _ExcInfoType = ...,
237+
def warning(self, msg: Any, *args: Any, exc_info: _ExcInfoType = ...,
238238
stack_info: bool = ..., extra: Optional[Dict[str, Any]] = ...,
239239
**kwargs: Any) -> None: ...
240-
def error(self, msg: Text, *args: Any, exc_info: _ExcInfoType = ...,
240+
def error(self, msg: Any, *args: Any, exc_info: _ExcInfoType = ...,
241241
stack_info: bool = ..., extra: Optional[Dict[str, Any]] = ...,
242242
**kwargs: Any) -> None: ...
243-
def exception(self, msg: Text, *args: Any, exc_info: _ExcInfoType = ...,
243+
def exception(self, msg: Any, *args: Any, exc_info: _ExcInfoType = ...,
244244
stack_info: bool = ..., extra: Optional[Dict[str, Any]] = ...,
245245
**kwargs: Any) -> None: ...
246-
def critical(self, msg: Text, *args: Any, exc_info: _ExcInfoType = ...,
246+
def critical(self, msg: Any, *args: Any, exc_info: _ExcInfoType = ...,
247247
stack_info: bool = ..., extra: Optional[Dict[str, Any]] = ...,
248248
**kwargs: Any) -> None: ...
249-
def log(self, lvl: int, msg: Text, *args: Any, exc_info: _ExcInfoType = ...,
249+
def log(self, lvl: int, msg: Any, *args: Any, exc_info: _ExcInfoType = ...,
250250
stack_info: bool = ..., extra: Optional[Dict[str, Any]] = ...,
251251
**kwargs: Any) -> None: ...
252252
else:
253253
def debug(self,
254-
msg: Text, *args: Any, exc_info: _ExcInfoType = ...,
254+
msg: Any, *args: Any, exc_info: _ExcInfoType = ...,
255255
extra: Optional[Dict[str, Any]] = ..., **kwargs: Any) -> None: ...
256256
def info(self,
257-
msg: Text, *args: Any, exc_info: _ExcInfoType = ...,
257+
msg: Any, *args: Any, exc_info: _ExcInfoType = ...,
258258
extra: Optional[Dict[str, Any]] = ..., **kwargs: Any) -> None: ...
259259
def warning(self,
260-
msg: Text, *args: Any, exc_info: _ExcInfoType = ...,
260+
msg: Any, *args: Any, exc_info: _ExcInfoType = ...,
261261
extra: Optional[Dict[str, Any]] = ..., **kwargs: Any) -> None: ...
262262
def error(self,
263-
msg: Text, *args: Any, exc_info: _ExcInfoType = ...,
263+
msg: Any, *args: Any, exc_info: _ExcInfoType = ...,
264264
extra: Optional[Dict[str, Any]] = ..., **kwargs: Any) -> None: ...
265265
def exception(self,
266-
msg: Text, *args: Any, exc_info: _ExcInfoType = ...,
266+
msg: Any, *args: Any, exc_info: _ExcInfoType = ...,
267267
extra: Optional[Dict[str, Any]] = ..., **kwargs: Any) -> None: ...
268268
def critical(self,
269-
msg: Text, *args: Any, exc_info: _ExcInfoType = ...,
269+
msg: Any, *args: Any, exc_info: _ExcInfoType = ...,
270270
extra: Optional[Dict[str, Any]] = ..., **kwargs: Any) -> None: ...
271271
def log(self,
272-
lvl: int, msg: Text, *args: Any, exc_info: _ExcInfoType = ...,
272+
lvl: int, msg: Any, *args: Any, exc_info: _ExcInfoType = ...,
273273
extra: Optional[Dict[str, Any]] = ..., **kwargs: Any) -> None: ...
274274
def isEnabledFor(self, lvl: int) -> bool: ...
275275
if sys.version_info >= (3,):
@@ -290,46 +290,46 @@ if sys.version_info >= (3,):
290290
def getLogRecordFactory() -> Callable[..., LogRecord]: ...
291291

292292
if sys.version_info >= (3,):
293-
def debug(msg: Text, *args: Any, exc_info: _ExcInfoType = ...,
293+
def debug(msg: Any, *args: Any, exc_info: _ExcInfoType = ...,
294294
stack_info: bool = ..., extra: Optional[Dict[str, Any]] = ...,
295295
**kwargs: Any) -> None: ...
296-
def info(msg: Text, *args: Any, exc_info: _ExcInfoType = ...,
296+
def info(msg: Any, *args: Any, exc_info: _ExcInfoType = ...,
297297
stack_info: bool = ..., extra: Optional[Dict[str, Any]] = ...,
298298
**kwargs: Any) -> None: ...
299-
def warning(msg: Text, *args: Any, exc_info: _ExcInfoType = ...,
299+
def warning(msg: Any, *args: Any, exc_info: _ExcInfoType = ...,
300300
stack_info: bool = ..., extra: Optional[Dict[str, Any]] = ...,
301301
**kwargs: Any) -> None: ...
302-
def warn(msg: Text, *args: Any, exc_info: _ExcInfoType = ...,
302+
def warn(msg: Any, *args: Any, exc_info: _ExcInfoType = ...,
303303
stack_info: bool = ..., extra: Optional[Dict[str, Any]] = ...,
304304
**kwargs: Any) -> None: ...
305-
def error(msg: Text, *args: Any, exc_info: _ExcInfoType = ...,
305+
def error(msg: Any, *args: Any, exc_info: _ExcInfoType = ...,
306306
stack_info: bool = ..., extra: Optional[Dict[str, Any]] = ...,
307307
**kwargs: Any) -> None: ...
308-
def critical(msg: Text, *args: Any, exc_info: _ExcInfoType = ...,
308+
def critical(msg: Any, *args: Any, exc_info: _ExcInfoType = ...,
309309
stack_info: bool = ..., extra: Optional[Dict[str, Any]] = ...,
310310
**kwargs: Any) -> None: ...
311-
def exception(msg: Text, *args: Any, exc_info: _ExcInfoType = ...,
311+
def exception(msg: Any, *args: Any, exc_info: _ExcInfoType = ...,
312312
stack_info: bool = ..., extra: Optional[Dict[str, Any]] = ...,
313313
**kwargs: Any) -> None: ...
314-
def log(lvl: int, msg: Text, *args: Any, exc_info: _ExcInfoType = ...,
314+
def log(lvl: int, msg: Any, *args: Any, exc_info: _ExcInfoType = ...,
315315
stack_info: bool = ..., extra: Optional[Dict[str, Any]] = ...,
316316
**kwargs: Any) -> None: ...
317317
else:
318-
def debug(msg: Text, *args: Any, exc_info: _ExcInfoType = ...,
318+
def debug(msg: Any, *args: Any, exc_info: _ExcInfoType = ...,
319319
extra: Optional[Dict[str, Any]] = ..., **kwargs: Any) -> None: ...
320-
def info(msg: Text, *args: Any, exc_info: _ExcInfoType = ...,
320+
def info(msg: Any, *args: Any, exc_info: _ExcInfoType = ...,
321321
extra: Optional[Dict[str, Any]] = ..., **kwargs: Any) -> None: ...
322-
def warning(msg: Text, *args: Any, exc_info: _ExcInfoType = ...,
322+
def warning(msg: Any, *args: Any, exc_info: _ExcInfoType = ...,
323323
extra: Optional[Dict[str, Any]] = ..., **kwargs: Any) -> None: ...
324-
def warn(msg: Text, *args: Any, exc_info: _ExcInfoType = ...,
324+
def warn(msg: Any, *args: Any, exc_info: _ExcInfoType = ...,
325325
extra: Optional[Dict[str, Any]] = ..., **kwargs: Any) -> None: ...
326-
def error(msg: Text, *args: Any, exc_info: _ExcInfoType = ...,
326+
def error(msg: Any, *args: Any, exc_info: _ExcInfoType = ...,
327327
extra: Optional[Dict[str, Any]] = ..., **kwargs: Any) -> None: ...
328-
def critical(msg: Text, *args: Any, exc_info: _ExcInfoType = ...,
328+
def critical(msg: Any, *args: Any, exc_info: _ExcInfoType = ...,
329329
extra: Optional[Dict[str, Any]] = ..., **kwargs: Any) -> None: ...
330-
def exception(msg: Text, *args: Any, exc_info: _ExcInfoType = ...,
330+
def exception(msg: Any, *args: Any, exc_info: _ExcInfoType = ...,
331331
extra: Optional[Dict[str, Any]] = ..., **kwargs: Any) -> None: ...
332-
def log(lvl: int, msg: Text, *args: Any, exc_info: _ExcInfoType = ...,
332+
def log(lvl: int, msg: Any, *args: Any, exc_info: _ExcInfoType = ...,
333333
extra: Optional[Dict[str, Any]] = ..., **kwargs: Any) -> None: ...
334334
fatal = critical
335335

0 commit comments

Comments
 (0)