janware/jw-python
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-python synced 2026-01-15 18:03:31 +01:00
Code Releases Activity

Add type annotations from monkeytype + jw-devops/test

Browse source 
Add type annotations as generated by monkeytype and jw-devops/test, plus some
hand editing to satisfy both monkeytype and mypy.

Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2020-04-10 17:55:36 +02:00
commit 77d43aebad
7 changed files with 51 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

23
tools/python/jwutils/log.py
View file

@ -4,6 +4,7 @@ import sys
import inspect
from os.path import basename
from datetime import datetime
from typing import List, Tuple
from . import misc
# --- python 2 / 3 compatibility stuff
@ -74,11 +75,11 @@ _prio_colors = {
EMERG : [ CONSOLE_FONT_BOLD + CONSOLE_FONT_MAGENTA, CONSOLE_FONT_OFF ],
}
def get_caller_pos(up = 1):
def get_caller_pos(up: int = 1) -> Tuple[str, int]:
caller = inspect.stack()[up+1]
return (basename(caller.filename), caller.lineno)
def slog_m(prio, *args, **kwargs): # export
def slog_m(prio: int, *args, **kwargs) -> None: # export
if prio > _level:
return
if len(args):
@ -96,7 +97,7 @@ def slog_m(prio, *args, **kwargs): # export
for line in margs[1:].split('\n'):
slog(prio, line, **kwargs, caller=caller)
def slog(prio, *args, **kwargs): # export
def slog(prio: int, *args, **kwargs) -> None: # export
if prio > _level:
return
@ -145,11 +146,11 @@ def slog(prio, *args, **kwargs): # export
for file in files:
print(msg, file=file)
def parse_log_prio_str(prio): # export
def parse_log_prio_str(prio: str) -> int: # export
try:
r = int(prio)
if r < 0 or r > DEVEL:
raise Exeption("Invalid log priority ", prio)
raise Exception("Invalid log priority ", prio)
except ValueError:
map_prio_str_to_val = {
"EMERG" : EMERG,
@ -177,19 +178,19 @@ def parse_log_prio_str(prio): # export
return map_prio_str_to_val[prio]
raise Exception("Unknown priority string \"", prio, "\"")
def console_color_chars(prio): # export
def console_color_chars(prio: int) -> List[str]: # export
if not sys.stdout.isatty():
return [ '', '' ]
return _prio_colors[prio]
def set_level(level_): # export
def set_level(level_: str) -> None: # export
global _level
if isinstance(level_, basestring):
_level = parse_log_prio_str(level_)
return
_level = level_
def set_flags(flags_): # export
def set_flags(flags_: str) -> None: # export
global _flags
_flags = set(flags_.split(','))
@ -208,20 +209,20 @@ def set_flags(flags_): # export
#pid
#highlight_first_error
def append_to_prefix(prefix): # export
def append_to_prefix(prefix: str) -> str: # export
global _log_prefix
r = _log_prefix
if prefix:
_log_prefix += prefix
return r
def remove_from_prefix(count): # export
def remove_from_prefix(count: int) -> str: # export
global _log_prefix
r = _log_prefix
_log_prefix = _log_prefix[:-count]
return r
def set_filename_length(l): # export
def set_filename_length(l: int) -> int: # export
global _file_name_len
r = _file_name_len
if l: