From bccd6155fb0d4d9d1166d4775d8958b80c2f67d8 Mon Sep 17 00:00:00 2001 From: theonepath Date: Thu, 6 Jul 2023 20:14:39 +0100 Subject: [PATCH] Moved clog => src/clog Change is to be compliant with pyproject.toml and hatchling --- clog/__init__.py | 1 - src/clog/__init__.py | 1 + {clog => src/clog}/__version__.py | 0 {clog => src/clog}/_logger.py | 4 ++-- {clog => src/clog}/utils/__init__.py | 0 {clog => src/clog}/utils/common.py | 0 {clog => src/clog}/utils/printfmt.py | 0 7 files changed, 3 insertions(+), 3 deletions(-) delete mode 100644 clog/__init__.py create mode 100644 src/clog/__init__.py rename {clog => src/clog}/__version__.py (100%) rename {clog => src/clog}/_logger.py (99%) rename {clog => src/clog}/utils/__init__.py (100%) rename {clog => src/clog}/utils/common.py (100%) rename {clog => src/clog}/utils/printfmt.py (100%) diff --git a/clog/__init__.py b/clog/__init__.py deleted file mode 100644 index 0faf7a4..0000000 --- a/clog/__init__.py +++ /dev/null @@ -1 +0,0 @@ -from ._logger import Logger \ No newline at end of file diff --git a/src/clog/__init__.py b/src/clog/__init__.py new file mode 100644 index 0000000..6b28c0e --- /dev/null +++ b/src/clog/__init__.py @@ -0,0 +1 @@ +from clog._logger import Logger diff --git a/clog/__version__.py b/src/clog/__version__.py similarity index 100% rename from clog/__version__.py rename to src/clog/__version__.py diff --git a/clog/_logger.py b/src/clog/_logger.py similarity index 99% rename from clog/_logger.py rename to src/clog/_logger.py index 71ca6f7..fd2085b 100644 --- a/clog/_logger.py +++ b/src/clog/_logger.py @@ -257,7 +257,7 @@ class Logger: # class redeclaration & initialisation _frame = sys._getframe(2) if sys._getframe(1).f_code.co_name in \ dir(Logger) else sys._getframe(1) ## get the executing filename of where log was called - _fname = _frame.f_code.co_filename.removeprefix( + _fname = _frame.f_code.co_filename.lstrip( os.getcwd()).strip('\\/') ## generate new header for log file and construct new message _val = [*map(str, value)] # convert all objects to string @@ -368,4 +368,4 @@ class Logger: # class redeclaration & initialisation ## reset the colour sequence back to normal print(printfmt.Colours.NORMAL, end=e, file=Logger.__stdpipe, flush=flsh) else: - print(*msg, sep=s, end=e, file=Logger.__stdpipe, flush=flsh) # type: ignore \ No newline at end of file + print(*msg, sep=s, end=e, file=Logger.__stdpipe, flush=flsh) # type: ignore diff --git a/clog/utils/__init__.py b/src/clog/utils/__init__.py similarity index 100% rename from clog/utils/__init__.py rename to src/clog/utils/__init__.py diff --git a/clog/utils/common.py b/src/clog/utils/common.py similarity index 100% rename from clog/utils/common.py rename to src/clog/utils/common.py diff --git a/clog/utils/printfmt.py b/src/clog/utils/printfmt.py similarity index 100% rename from clog/utils/printfmt.py rename to src/clog/utils/printfmt.py