Make more like CPython's logger

Author: dastels

README.rst

@@ -31,13 +31,13 @@ Usage Example
 
 .. code-block:: python
 
-    from adafruit_logger import Logger, ERROR, INFO
+    import logging
 
-    logger = Logger()
+    logger = getLogger('test')
 
-    logger.level = ERROR
-    logger.log(INFO, 'Info message')
-    logger.log(ERROR, 'Error message')
+    logger.setLevel(logging.ERROR)
+    logger.info('Info message')
+    logger.error('Error message')
 
 
 Contributing

docs/api.rst

@@ -4,5 +4,5 @@
 .. If your library file(s) are nested in a directory (e.g. /adafruit_foo/foo.py)
 .. use this format as the module name: "adafruit_foo.foo"
 
-.. automodule:: adafruit_logger
+.. automodule:: logging
    :members:

examples/logger_simpletest.py

@@ -1,8 +1,8 @@
 #pylint:disable=undefined-variable,wildcard-import,no-name-in-module
-from adafruit_logger import Logger, ERROR, INFO
+import logging
 
-logger = Logger()
+logger = logging.getLogger('test')
 
-logger.level = ERROR
-logger.log(INFO, 'Info message')
-logger.log(ERROR, 'Error message')
+logger.setLevel(logging.ERROR)
+logger.info('Info message')
+logger.error('Error message')

adafruit_logger.py renamed to logging.py

@@ -20,7 +20,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 """
-`adafruit_logger`
+`logging`
 ================================================================================
 
 Logging module for CircuitPython
@@ -65,7 +65,9 @@ def level_for(value):
 
     """
     for i in range(len(LEVELS)):
-        if value < LEVELS[i][0]:
+        if value == LEVELS[i][0]:
+            return LEVELS[i][1]
+        elif value < LEVELS[i][0]:
             return LEVELS[i-1][1]
     return LEVELS[0][1]
 
@@ -108,6 +110,13 @@ def emit(self, level, msg):
 # The level module-global variables get created when loaded
 #pylint:disable=undefined-variable
 
+logger_cache = dict()
+
+def getLogger(name):
+    if name not in logger_cache:
+        logger_cache[name] = Logger()
+    return logger_cache[name]
+
 class Logger(object):
     """Provide a logging api."""
 
@@ -123,13 +132,7 @@ def __init__(self, handler=None):
         else:
             self._handler = handler
 
-    @property
-    def level(self):
-        """The level."""
-        return self._level
-
-    @level.setter
-    def level(self, value):
+    def setLevel(self, value):
         self._level = value
 
     def log(self, level, format_string, *args):
@@ -140,8 +143,8 @@ def log(self, level, format_string, *args):
         :param args: arguments to ``format_string.format()``, can be empty
 
         """
-        if self._level != NOTSET and level >= self._level:
-            self._handler.emit(level, format_string.format(*args))
+        if level >= self._level:
+            self._handler.emit(level, format_string % args)
 
     def debug(self, format_string, *args):
         """Log a debug message.

setup.py

@@ -59,5 +59,5 @@
     # simple. Or you can use find_packages().
     # TODO: IF LIBRARY FILES ARE A PACKAGE FOLDER,
     #       CHANGE `py_modules=['...']` TO `packages=['...']`
-    py_modules=['adafruit_logger'],
+    py_modules=['logging'],
 )