From feb4652e3cd5eb81dd601de70f0b12daee341b24 Mon Sep 17 00:00:00 2001 From: Sam Clements Date: Mon, 23 Aug 2021 11:09:38 +0100 Subject: [PATCH] Sort imports, pass flake8 by adding __all__ to colorlog.wrappers --- colorlog/__init__.py | 36 ++++++++++++++--------------- colorlog/tests/test_escape_codes.py | 4 ++-- colorlog/wrappers.py | 22 ++++++++++++++++++ setup.py | 2 +- 4 files changed, 43 insertions(+), 21 deletions(-) diff --git a/colorlog/__init__.py b/colorlog/__init__.py index 2552f7d..fb123b8 100644 --- a/colorlog/__init__.py +++ b/colorlog/__init__.py @@ -32,30 +32,30 @@ ) __all__ = ( + "CRITICAL", + "DEBUG", + "ERROR", + "FATAL", + "INFO", + "NOTSET", + "WARN", + "WARNING", "ColoredFormatter", - "default_log_colors", + "LevelFormatter", + "StreamHandler", + "TTYColoredFormatter", "basicConfig", - "root", - "getLogger", + "critical", "debug", - "info", - "warning", + "default_log_colors", "error", "exception", - "critical", - "log", "exception", - "StreamHandler", - "LevelFormatter", - "TTYColoredFormatter", - "CRITICAL", - "FATAL", - "ERROR", - "WARNING", - "WARN", - "INFO", - "DEBUG", - "NOTSET", + "getLogger", + "info", + "log", + "root", + "warning", ) if sys.version_info < (3, 6): diff --git a/colorlog/tests/test_escape_codes.py b/colorlog/tests/test_escape_codes.py index 9a235cf..ba9b498 100644 --- a/colorlog/tests/test_escape_codes.py +++ b/colorlog/tests/test_escape_codes.py @@ -1,9 +1,9 @@ """Test the colorlog.escape_codes module.""" -from colorlog.escape_codes import escape_codes, esc, parse_colors - import pytest +from colorlog.escape_codes import esc, escape_codes, parse_colors + def test_esc(): assert esc(1, 2, 3) == "\033[1;2;3m" diff --git a/colorlog/wrappers.py b/colorlog/wrappers.py index 80018b9..7434ef5 100644 --- a/colorlog/wrappers.py +++ b/colorlog/wrappers.py @@ -19,6 +19,28 @@ import colorlog.formatter +__all__ = ( + "CRITICAL", + "DEBUG", + "ERROR", + "FATAL", + "INFO", + "NOTSET", + "WARN", + "WARNING", + "StreamHandler", + "basicConfig", + "critical", + "debug", + "error", + "exception", + "getLogger", + "info", + "log", + "root", + "warning", +) + def basicConfig( style: str = "%", diff --git a/setup.py b/setup.py index 6511d82..c4924b1 100644 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ setup( name="colorlog", - version="6.4.0", + version="6.4.1", description="Add colours to the output of Python's logging module.", long_description=open("README.md").read(), long_description_content_type="text/markdown",