Skip to content

Commit b868341

Browse files
authored
Merge pull request #21 from tekktrik/feature/add-typing
Feature/add typing
2 parents bbdb8d3 + 48782cb commit b868341

File tree

1 file changed

+24
-24
lines changed

1 file changed

+24
-24
lines changed

adafruit_logging.py

+24-24
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
globals()[name] = value
4646

4747

48-
def level_for(value):
48+
def level_for(value: int) -> str:
4949
"""Convert a numberic level to the most appropriate name.
5050
5151
:param value: a numeric level
@@ -62,7 +62,7 @@ def level_for(value):
6262
class LoggingHandler:
6363
"""Abstract logging message handler."""
6464

65-
def format(self, level, msg):
65+
def format(self, level: int, msg: str) -> str:
6666
"""Generate a timestamped message.
6767
6868
:param level: the logging level
@@ -71,7 +71,7 @@ def format(self, level, msg):
7171
"""
7272
return "{0}: {1} - {2}".format(time.monotonic(), level_for(level), msg)
7373

74-
def emit(self, level, msg):
74+
def emit(self, level: int, msg: str):
7575
"""Send a message where it should go.
7676
Place holder for subclass implementations.
7777
"""
@@ -81,8 +81,8 @@ def emit(self, level, msg):
8181
class PrintHandler(LoggingHandler):
8282
"""Send logging messages to the console by using print."""
8383

84-
def emit(self, level, msg):
85-
"""Send a message to teh console.
84+
def emit(self, level: int, msg: str):
85+
"""Send a message to the console.
8686
8787
:param level: the logging level
8888
:param msg: the message to log
@@ -98,7 +98,7 @@ def emit(self, level, msg):
9898
null_logger = None
9999

100100
# pylint:disable=global-statement
101-
def getLogger(name):
101+
def getLogger(name: str) -> "Logger":
102102
"""Create or retrieve a logger by name.
103103
104104
:param name: the name of the logger to create/retrieve None will cause the
@@ -127,23 +127,23 @@ def __init__(self):
127127
self._level = NOTSET
128128
self._handler = PrintHandler()
129129

130-
def setLevel(self, value):
130+
def setLevel(self, value: int):
131131
"""Set the logging cuttoff level.
132132
133133
:param value: the lowest level to output
134134
135135
"""
136136
self._level = value
137137

138-
def getEffectiveLevel(self):
138+
def getEffectiveLevel(self) -> int:
139139
"""Get the effective level for this logger.
140140
141141
:return: the lowest level to output
142142
143143
"""
144144
return self._level
145145

146-
def addHandler(self, hldr):
146+
def addHandler(self, hldr: LoggingHandler):
147147
"""Sets the handler of this logger to the specified handler.
148148
*NOTE* this is slightly different from the CPython equivalent which adds
149149
the handler rather than replaceing it.
@@ -153,7 +153,7 @@ def addHandler(self, hldr):
153153
"""
154154
self._handler = hldr
155155

156-
def log(self, level, format_string, *args):
156+
def log(self, level: int, format_string: str, *args):
157157
"""Log a message.
158158
159159
:param level: the priority level at which to log
@@ -164,7 +164,7 @@ def log(self, level, format_string, *args):
164164
if level >= self._level:
165165
self._handler.emit(level, format_string % args)
166166

167-
def debug(self, format_string, *args):
167+
def debug(self, format_string: str, *args):
168168
"""Log a debug message.
169169
170170
:param format_string: the core message string with embedded formatting directives
@@ -173,7 +173,7 @@ def debug(self, format_string, *args):
173173
"""
174174
self.log(DEBUG, format_string, *args)
175175

176-
def info(self, format_string, *args):
176+
def info(self, format_string: str, *args):
177177
"""Log a info message.
178178
179179
:param format_string: the core message string with embedded formatting directives
@@ -182,7 +182,7 @@ def info(self, format_string, *args):
182182
"""
183183
self.log(INFO, format_string, *args)
184184

185-
def warning(self, format_string, *args):
185+
def warning(self, format_string: str, *args):
186186
"""Log a warning message.
187187
188188
:param format_string: the core message string with embedded formatting directives
@@ -191,7 +191,7 @@ def warning(self, format_string, *args):
191191
"""
192192
self.log(WARNING, format_string, *args)
193193

194-
def error(self, format_string, *args):
194+
def error(self, format_string: str, *args):
195195
"""Log a error message.
196196
197197
:param format_string: the core message string with embedded formatting directives
@@ -200,7 +200,7 @@ def error(self, format_string, *args):
200200
"""
201201
self.log(ERROR, format_string, *args)
202202

203-
def critical(self, format_string, *args):
203+
def critical(self, format_string: str, *args):
204204
"""Log a critical message.
205205
206206
:param format_string: the core message string with embedded formatting directives
@@ -217,30 +217,30 @@ class NullLogger:
217217
def __init__(self):
218218
"""Dummy implementation."""
219219

220-
def setLevel(self, value):
220+
def setLevel(self, value: int):
221221
"""Dummy implementation."""
222222

223-
def getEffectiveLevel(self):
223+
def getEffectiveLevel(self) -> int:
224224
"""Dummy implementation."""
225225
return NOTSET
226226

227-
def addHandler(self, hldr):
227+
def addHandler(self, hldr: LoggingHandler):
228228
"""Dummy implementation."""
229229

230-
def log(self, level, format_string, *args):
230+
def log(self, level: int, format_string: str, *args):
231231
"""Dummy implementation."""
232232

233-
def debug(self, format_string, *args):
233+
def debug(self, format_string: str, *args):
234234
"""Dummy implementation."""
235235

236-
def info(self, format_string, *args):
236+
def info(self, format_string: str, *args):
237237
"""Dummy implementation."""
238238

239-
def warning(self, format_string, *args):
239+
def warning(self, format_string: str, *args):
240240
"""Dummy implementation."""
241241

242-
def error(self, format_string, *args):
242+
def error(self, format_string: str, *args):
243243
"""Dummy implementation."""
244244

245-
def critical(self, format_string, *args):
245+
def critical(self, format_string: str, *args):
246246
"""Dummy implementation."""

0 commit comments

Comments
 (0)