removed requirement to add space to time format in log

Author: willmcgugan

pyproject.toml

@@ -2,7 +2,7 @@
 name = "rich"
 homepage = "https://github.com/willmcgugan/rich"
 documentation = "https://rich.readthedocs.io/en/latest/"
-version = "1.1.1"
+version = "1.1.2"
 description = "Render rich text, tables, progress bars, syntax highlighting, markdown and more to the terminal"
 authors = ["Will McGugan <willmcgugan@gmail.com>"]
 license = "MIT"

rich/_log_render.py

@@ -14,7 +14,7 @@ def __init__(
         show_time: bool = True,
         show_level: bool = False,
         show_path: bool = True,
-        time_format: str = "[%x %X] ",
+        time_format: str = "[%x %X]",
     ) -> None:
         self.show_time = show_time
         self.show_level = show_level
@@ -35,11 +35,11 @@ def __call__(
         from .containers import Renderables
         from .table import Table
 
-        output = Table(show_header=False, expand=True, box=None, padding=0)
+        output = Table(show_header=False, expand=True, box=None, padding=(0, 1, 0, 0))
         if self.show_time:
             output.add_column(style="log.time")
         if self.show_level:
-            output.add_column(style="log.level", width=9)
+            output.add_column(style="log.level", width=8)
         output.add_column(ratio=1, style="log.message")
         if self.show_path and path:
             output.add_column(style="log.path")
@@ -57,7 +57,7 @@ def __call__(
             row.append(level)
         row.append(Renderables(renderables))
         if self.show_path and path:
-            row.append(Text(f"{path}:{line_no}" if line_no else path))
+            row.append(Text(f" {path}:{line_no}" if line_no else path))
 
         output.add_row(*row)
         return output

rich/console.py

@@ -259,7 +259,7 @@ def __init__(
         highlight: bool = True,
         log_time: bool = True,
         log_path: bool = True,
-        log_time_format: str = "[%X] ",
+        log_time_format: str = "[%X]",
         highlighter: Optional["HighlighterType"] = ReprHighlighter(),
     ):
         self._styles = themes.DEFAULT.styles if theme is None else theme.styles

rich/logging.py

@@ -62,7 +62,7 @@ def emit(self, record: LogRecord) -> None:
     FORMAT = "%(message)s"
     # FORMAT = "%(asctime)-15s - %(level) - %(message)s"
     logging.basicConfig(
-        level="NOTSET", format=FORMAT, datefmt="[%X] ", handlers=[RichHandler()]
+        level="NOTSET", format=FORMAT, datefmt="[%X]", handlers=[RichHandler()]
     )
     log = logging.getLogger("rich")
 

tests/test_log.py

@@ -13,7 +13,7 @@ def render_log():
         file=io.StringIO(),
         width=80,
         force_terminal=True,
-        log_time_format="[TIME] ",
+        log_time_format="[TIME]",
         color_system="truecolor",
     )
     console.log()
@@ -23,7 +23,7 @@ def render_log():
 
 
 def test_log():
-    expected = "\n\x1b[2;36m[TIME] \x1b[0mHello from \x1b[1m<\x1b[0m\x1b[1;38;5;13mconsole\x1b[0m\x1b[39m \x1b[0m\x1b[3;33mwidth\x1b[0m\x1b[39m=\x1b[0m\x1b[1;34m80\x1b[0m\x1b[39m ColorSystem.TRUECOLOR\x1b[0m\x1b[1m>\x1b[0m !      \x1b[2mtest_log.py:20\x1b[0m\n\x1b[2;36m       \x1b[0m\x1b[1m[\x1b[0m\x1b[1;34m1\x1b[0m, \x1b[1;34m2\x1b[0m, \x1b[1;34m3\x1b[0m\x1b[1m]\x1b[0m                                                  \x1b[2mtest_log.py:21\x1b[0m\n       \x1b[3m                        Locals                             \x1b[0m              \n       \x1b[34m╭─────────┬────────────────────────────────────────╮\x1b[0m                     \n       \x1b[34m│\x1b[0m\x1b[32m'console'\x1b[0m\x1b[34m│\x1b[0m\x1b[1m<\x1b[0m\x1b[1;38;5;13mconsole\x1b[0m\x1b[39m \x1b[0m\x1b[3;33mwidth\x1b[0m\x1b[39m=\x1b[0m\x1b[1;34m80\x1b[0m\x1b[39m ColorSystem.TRUECOLOR\x1b[0m\x1b[1m>\x1b[0m\x1b[34m│\x1b[0m                     \n       \x1b[34m╰─────────┴────────────────────────────────────────╯\x1b[0m                     \n"
+    expected = "\n\x1b[2;36m[TIME]\x1b[0m\x1b[2;36m \x1b[0mHello from \x1b[1m<\x1b[0m\x1b[1;38;5;13mconsole\x1b[0m\x1b[39m \x1b[0m\x1b[3;33mwidth\x1b[0m\x1b[39m=\x1b[0m\x1b[1;34m80\x1b[0m\x1b[39m ColorSystem.TRUECOLOR\x1b[0m\x1b[1m>\x1b[0m !    \x1b[2m test_log.py:20\x1b[0m\x1b[2m \x1b[0m\n\x1b[2;36m      \x1b[0m\x1b[2;36m \x1b[0m\x1b[1m[\x1b[0m\x1b[1;34m1\x1b[0m, \x1b[1;34m2\x1b[0m, \x1b[1;34m3\x1b[0m\x1b[1m]\x1b[0m                                                \x1b[2m test_log.py:21\x1b[0m\x1b[2m \x1b[0m\n       \x1b[3m                        Locals                          \x1b[0m                 \n       \x1b[34m╭─────────┬────────────────────────────────────────╮\x1b[0m                     \n       \x1b[34m│\x1b[0m\x1b[32m'console'\x1b[0m\x1b[34m│\x1b[0m\x1b[1m<\x1b[0m\x1b[1;38;5;13mconsole\x1b[0m\x1b[39m \x1b[0m\x1b[3;33mwidth\x1b[0m\x1b[39m=\x1b[0m\x1b[1;34m80\x1b[0m\x1b[39m ColorSystem.TRUECOLOR\x1b[0m\x1b[1m>\x1b[0m\x1b[34m│\x1b[0m                     \n       \x1b[34m╰─────────┴────────────────────────────────────────╯\x1b[0m                     \n"
     assert render_log() == expected
 
 

tests/test_logging.py

@@ -8,7 +8,7 @@
     console=Console(file=io.StringIO(), force_terminal=True, width=80)
 )
 logging.basicConfig(
-    level="NOTSET", format="%(message)s", datefmt="[DATE] ", handlers=[handler]
+    level="NOTSET", format="%(message)s", datefmt="[DATE]", handlers=[handler]
 )
 log = logging.getLogger("rich")
 
@@ -21,7 +21,7 @@ def make_log():
 
 def test_log():
     render = make_log()
-    expected = "\x1b[2;36m[DATE] \x1b[0m\x1b[32mDEBUG\x1b[0m    foo                                           \x1b[2mtest_logging.py:17\x1b[0m\n"
+    expected = "\x1b[2;36m[DATE]\x1b[0m\x1b[2;36m \x1b[0m\x1b[32mDEBUG\x1b[0m    foo                                         \x1b[2m test_logging.py:17\x1b[0m\x1b[2m \x1b[0m\n"
     assert render == expected