log21 2.9.2__tar.gz → 2.10.0__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {log21-2.9.2/src/log21.egg-info → log21-2.10.0}/PKG-INFO +5 -4
- {log21-2.9.2 → log21-2.10.0}/README.md +4 -3
- {log21-2.9.2 → log21-2.10.0}/pyproject.toml +17 -17
- {log21-2.9.2 → log21-2.10.0}/src/log21/Argumentify.py +105 -15
- {log21-2.9.2 → log21-2.10.0}/src/log21/__init__.py +5 -3
- {log21-2.9.2 → log21-2.10.0/src/log21.egg-info}/PKG-INFO +5 -4
- {log21-2.9.2 → log21-2.10.0}/LICENSE.txt +0 -0
- {log21-2.9.2 → log21-2.10.0}/setup.cfg +0 -0
- {log21-2.9.2 → log21-2.10.0}/src/log21/Argparse.py +0 -0
- {log21-2.9.2 → log21-2.10.0}/src/log21/Colors.py +0 -0
- {log21-2.9.2 → log21-2.10.0}/src/log21/CrashReporter/Formatters.py +0 -0
- {log21-2.9.2 → log21-2.10.0}/src/log21/CrashReporter/Reporters.py +0 -0
- {log21-2.9.2 → log21-2.10.0}/src/log21/CrashReporter/__init__.py +0 -0
- {log21-2.9.2 → log21-2.10.0}/src/log21/FileHandler.py +0 -0
- {log21-2.9.2 → log21-2.10.0}/src/log21/Formatters.py +0 -0
- {log21-2.9.2 → log21-2.10.0}/src/log21/Levels.py +0 -0
- {log21-2.9.2 → log21-2.10.0}/src/log21/Logger.py +0 -0
- {log21-2.9.2 → log21-2.10.0}/src/log21/LoggingWindow.py +0 -0
- {log21-2.9.2 → log21-2.10.0}/src/log21/Manager.py +0 -0
- {log21-2.9.2 → log21-2.10.0}/src/log21/PPrint.py +0 -0
- {log21-2.9.2 → log21-2.10.0}/src/log21/ProgressBar.py +0 -0
- {log21-2.9.2 → log21-2.10.0}/src/log21/StreamHandler.py +0 -0
- {log21-2.9.2 → log21-2.10.0}/src/log21/TreePrint.py +0 -0
- {log21-2.9.2 → log21-2.10.0}/src/log21.egg-info/SOURCES.txt +0 -0
- {log21-2.9.2 → log21-2.10.0}/src/log21.egg-info/dependency_links.txt +0 -0
- {log21-2.9.2 → log21-2.10.0}/src/log21.egg-info/requires.txt +0 -0
- {log21-2.9.2 → log21-2.10.0}/src/log21.egg-info/top_level.txt +0 -0
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
Metadata-Version: 2.1
|
|
2
2
|
Name: log21
|
|
3
|
-
Version: 2.
|
|
3
|
+
Version: 2.10.0
|
|
4
4
|
Summary: A simple logging package that helps you log colorized messages in Windows console.
|
|
5
5
|
Author-email: "CodeWriter21(Mehrad Pooryoussof)" <CodeWriter21@gmail.com>
|
|
6
6
|
License: Apache License 2.0
|
|
@@ -92,10 +92,11 @@ pip install git+https://github.com/MPCodeWriter21/log21
|
|
|
92
92
|
Changes
|
|
93
93
|
-------
|
|
94
94
|
|
|
95
|
-
### 2.
|
|
95
|
+
### 2.10.0
|
|
96
96
|
|
|
97
|
-
+ Added
|
|
98
|
-
|
|
97
|
+
+ Added some exception classes to raise in the "argumentified" functions to show
|
|
98
|
+
*parser error* to the user: `ArgumentError`, `IncompatibleArguments`,
|
|
99
|
+
`RequiredArgument`, `TooFewArguments`
|
|
99
100
|
|
|
100
101
|
[Full CHANGELOG](https://github.com/MPCodeWriter21/log21/blob/master/CHANGELOG.md)
|
|
101
102
|
|
|
@@ -61,10 +61,11 @@ pip install git+https://github.com/MPCodeWriter21/log21
|
|
|
61
61
|
Changes
|
|
62
62
|
-------
|
|
63
63
|
|
|
64
|
-
### 2.
|
|
64
|
+
### 2.10.0
|
|
65
65
|
|
|
66
|
-
+ Added
|
|
67
|
-
|
|
66
|
+
+ Added some exception classes to raise in the "argumentified" functions to show
|
|
67
|
+
*parser error* to the user: `ArgumentError`, `IncompatibleArguments`,
|
|
68
|
+
`RequiredArgument`, `TooFewArguments`
|
|
68
69
|
|
|
69
70
|
[Full CHANGELOG](https://github.com/MPCodeWriter21/log21/blob/master/CHANGELOG.md)
|
|
70
71
|
|
|
@@ -5,7 +5,7 @@ build-backend = "setuptools.build_meta"
|
|
|
5
5
|
[project]
|
|
6
6
|
name = "log21"
|
|
7
7
|
authors = [
|
|
8
|
-
|
|
8
|
+
{name = "CodeWriter21(Mehrad Pooryoussof)", email = "CodeWriter21@gmail.com"}
|
|
9
9
|
]
|
|
10
10
|
description = "A simple logging package that helps you log colorized messages in Windows console."
|
|
11
11
|
readme = {file = "README.md", content-type = "text/markdown"}
|
|
@@ -13,20 +13,20 @@ requires-python = ">=3.8"
|
|
|
13
13
|
keywords = ['python', 'log', 'colorize', 'color', 'logging', 'Python3', 'CodeWriter21']
|
|
14
14
|
license = {text = "Apache License 2.0"}
|
|
15
15
|
classifiers = [
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
16
|
+
"Intended Audience :: Developers",
|
|
17
|
+
"Programming Language :: Python :: 3",
|
|
18
|
+
"Programming Language :: Python :: 3.7",
|
|
19
|
+
"Programming Language :: Python :: 3.10",
|
|
20
|
+
"Programming Language :: Python :: 3.11",
|
|
21
|
+
"Operating System :: Unix",
|
|
22
|
+
"Operating System :: Microsoft :: Windows",
|
|
23
|
+
"Operating System :: MacOS :: MacOS X"
|
|
24
24
|
]
|
|
25
25
|
dependencies = [
|
|
26
|
-
|
|
27
|
-
|
|
26
|
+
"webcolors",
|
|
27
|
+
"docstring-parser"
|
|
28
28
|
]
|
|
29
|
-
version = "2.
|
|
29
|
+
version = "2.10.0"
|
|
30
30
|
|
|
31
31
|
[tool.setuptools.packages.find]
|
|
32
32
|
where = ["src"]
|
|
@@ -43,11 +43,11 @@ dev = ["yapf", "isort", "docformatter", "pylint", "json5", "pytest"]
|
|
|
43
43
|
max-line-length = 88
|
|
44
44
|
|
|
45
45
|
disable = [
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
46
|
+
"too-few-public-methods",
|
|
47
|
+
"too-many-arguments",
|
|
48
|
+
"protected-access",
|
|
49
|
+
"too-many-locals",
|
|
50
|
+
"fixme",
|
|
51
51
|
]
|
|
52
52
|
|
|
53
53
|
[tool.pylint.design]
|
|
@@ -18,7 +18,8 @@ import log21.Argparse as _Argparse
|
|
|
18
18
|
__all__ = [
|
|
19
19
|
'argumentify', 'ArgumentifyError', 'ArgumentTypeError', 'FlagGenerationError',
|
|
20
20
|
'RESERVED_FLAGS', 'Callable', 'Argument', 'FunctionInfo', 'generate_flag',
|
|
21
|
-
'normalize_name', 'normalize_name_to_snake_case'
|
|
21
|
+
'normalize_name', 'normalize_name_to_snake_case', 'ArgumentError',
|
|
22
|
+
'IncompatibleArguments', 'RequiredArgument', 'TooFewArguments'
|
|
22
23
|
]
|
|
23
24
|
|
|
24
25
|
Callable = _Union[_Callable[..., _Any], _Callable[..., _Coroutine[_Any, _Any, _Any]]]
|
|
@@ -76,6 +77,90 @@ class FlagGenerationError(ArgumentifyError, RuntimeError):
|
|
|
76
77
|
self.arg_name = arg_name
|
|
77
78
|
|
|
78
79
|
|
|
80
|
+
class ArgumentError(ArgumentifyError):
|
|
81
|
+
"""Base of errors to raise in the argumentified functions to raise parser errors."""
|
|
82
|
+
|
|
83
|
+
def __init__(self, *args, message: _Optional[str] = None):
|
|
84
|
+
"""Initialize the exception.
|
|
85
|
+
|
|
86
|
+
:param args: The arguments that have a problem.
|
|
87
|
+
:param message: The error message to show.
|
|
88
|
+
"""
|
|
89
|
+
if message is None:
|
|
90
|
+
if args:
|
|
91
|
+
if len(args) > 1:
|
|
92
|
+
message = "There is a problem with the arguments: " + ', '.join(
|
|
93
|
+
f"`{arg}`" for arg in args
|
|
94
|
+
)
|
|
95
|
+
else:
|
|
96
|
+
message = "The argument `" + args[0] + "` is invalid."
|
|
97
|
+
self.message = message
|
|
98
|
+
self.arguments = args
|
|
99
|
+
|
|
100
|
+
|
|
101
|
+
class IncompatibleArguments(ArgumentError):
|
|
102
|
+
"""Raise when the user has used arguments that are incompatible with each other."""
|
|
103
|
+
|
|
104
|
+
def __init__(self, *args, message: _Optional[str] = None):
|
|
105
|
+
"""Initialize the exception.
|
|
106
|
+
|
|
107
|
+
:param args: The arguments that are incompatible.
|
|
108
|
+
:param message: The error message to show.
|
|
109
|
+
"""
|
|
110
|
+
super().__init__(*args, message)
|
|
111
|
+
if message is None:
|
|
112
|
+
if args:
|
|
113
|
+
if len(args) > 1:
|
|
114
|
+
message = "You cannot use all these together: " + ', '.join(
|
|
115
|
+
f"`{arg}`" for arg in args
|
|
116
|
+
)
|
|
117
|
+
else:
|
|
118
|
+
message = "The argument `" + args[0] + "` is not compatible."
|
|
119
|
+
self.message = message
|
|
120
|
+
|
|
121
|
+
|
|
122
|
+
class RequiredArgument(ArgumentError):
|
|
123
|
+
"""Raise this when there is a required argument missing."""
|
|
124
|
+
|
|
125
|
+
def __init__(self, *args, message: _Optional[str] = None):
|
|
126
|
+
"""Initialize the exception.
|
|
127
|
+
|
|
128
|
+
:param args: The arguments that are required.
|
|
129
|
+
:param message: The error message to show.
|
|
130
|
+
"""
|
|
131
|
+
super().__init__(*args, message)
|
|
132
|
+
if message is None:
|
|
133
|
+
if args:
|
|
134
|
+
if len(args) > 1:
|
|
135
|
+
message = "These arguments are required: " + ', '.join(
|
|
136
|
+
f"`{arg}`" for arg in args
|
|
137
|
+
)
|
|
138
|
+
else:
|
|
139
|
+
message = "The argument `" + args[0] + "` is required."
|
|
140
|
+
self.message = message
|
|
141
|
+
|
|
142
|
+
|
|
143
|
+
class TooFewArguments(ArgumentError):
|
|
144
|
+
"""Raise this when there were not enough arguments passed."""
|
|
145
|
+
|
|
146
|
+
def __init__(self, *args, message: _Optional[str] = None):
|
|
147
|
+
"""Initialize the exception.
|
|
148
|
+
|
|
149
|
+
:param args: The arguments that should be passed.
|
|
150
|
+
:param message: The error message to show.
|
|
151
|
+
"""
|
|
152
|
+
super().__init__(*args, message)
|
|
153
|
+
if message is None:
|
|
154
|
+
if args:
|
|
155
|
+
if len(args) > 1:
|
|
156
|
+
message = "You should use these arguments: " + ', '.join(
|
|
157
|
+
f"`{arg}`" for arg in args
|
|
158
|
+
)
|
|
159
|
+
else:
|
|
160
|
+
message = "The argument `" + args[0] + "` should be used."
|
|
161
|
+
self.message = message
|
|
162
|
+
|
|
163
|
+
|
|
79
164
|
def normalize_name_to_snake_case(name: str, sep_char: str = '_') -> str:
|
|
80
165
|
"""Returns the normalized name a class.
|
|
81
166
|
|
|
@@ -278,8 +363,7 @@ def _add_arguments(
|
|
|
278
363
|
|
|
279
364
|
|
|
280
365
|
def _argumentify_one(func: Callable):
|
|
281
|
-
"""This function argumentifies one function as the entry point of the
|
|
282
|
-
script.
|
|
366
|
+
"""This function argumentifies one function as the entry point of the script.
|
|
283
367
|
|
|
284
368
|
:param function: The function to argumentify.
|
|
285
369
|
"""
|
|
@@ -312,15 +396,18 @@ def _argumentify_one(func: Callable):
|
|
|
312
396
|
args.extend(getattr(cli_args, argument.name) or [])
|
|
313
397
|
else:
|
|
314
398
|
kwargs[argument.name] = getattr(cli_args, argument.name)
|
|
315
|
-
|
|
316
|
-
|
|
317
|
-
|
|
318
|
-
|
|
399
|
+
try:
|
|
400
|
+
result = func(*args, **kwargs)
|
|
401
|
+
# Check if the result is a coroutine
|
|
402
|
+
if isinstance(result, (_Coroutine, _Awaitable)):
|
|
403
|
+
_asyncio.run(result)
|
|
404
|
+
except ArgumentError as error:
|
|
405
|
+
parser.error(error.message)
|
|
319
406
|
|
|
320
407
|
|
|
321
408
|
def _argumentify(functions: _Dict[str, Callable]):
|
|
322
|
-
"""This function argumentifies one or more functions as the entry point of
|
|
323
|
-
|
|
409
|
+
"""This function argumentifies one or more functions as the entry point of the
|
|
410
|
+
script.
|
|
324
411
|
|
|
325
412
|
:param functions: A dictionary of functions to argumentify.
|
|
326
413
|
:raises RuntimeError:
|
|
@@ -361,15 +448,18 @@ def _argumentify(functions: _Dict[str, Callable]):
|
|
|
361
448
|
args.extend(getattr(cli_args, argument.name) or [])
|
|
362
449
|
else:
|
|
363
450
|
kwargs[argument.name] = getattr(cli_args, argument.name)
|
|
364
|
-
|
|
365
|
-
|
|
366
|
-
|
|
367
|
-
|
|
451
|
+
try:
|
|
452
|
+
result = function(*args, **kwargs)
|
|
453
|
+
# Check if the result is a coroutine
|
|
454
|
+
if isinstance(result, (_Coroutine, _Awaitable)):
|
|
455
|
+
_asyncio.run(result)
|
|
456
|
+
except ArgumentError as error:
|
|
457
|
+
parser.error(error.message)
|
|
368
458
|
|
|
369
459
|
|
|
370
460
|
def argumentify(entry_point: _Union[Callable, _List[Callable], _Dict[str, Callable]]):
|
|
371
|
-
"""This function argumentifies one or more functions as the entry point of
|
|
372
|
-
|
|
461
|
+
"""This function argumentifies one or more functions as the entry point of the
|
|
462
|
+
script.
|
|
373
463
|
|
|
374
464
|
1 #!/usr/bin/env python
|
|
375
465
|
2 # argumentified.py
|
|
@@ -16,14 +16,15 @@ from .Manager import Manager
|
|
|
16
16
|
from .Argparse import ColorizingArgumentParser
|
|
17
17
|
from .TreePrint import TreePrint, tree_format
|
|
18
18
|
from .Formatters import ColorizingFormatter, DecolorizingFormatter, _Formatter
|
|
19
|
-
from .Argumentify import
|
|
19
|
+
from .Argumentify import (ArgumentError, TooFewArguments, RequiredArgument,
|
|
20
|
+
IncompatibleArguments, argumentify)
|
|
20
21
|
from .FileHandler import FileHandler, DecolorizingFileHandler
|
|
21
22
|
from .ProgressBar import ProgressBar
|
|
22
23
|
from .LoggingWindow import LoggingWindow, LoggingWindowHandler
|
|
23
24
|
from .StreamHandler import StreamHandler, ColorizingStreamHandler
|
|
24
25
|
|
|
25
26
|
__author__ = 'CodeWriter21 (Mehrad Pooryoussof)'
|
|
26
|
-
__version__ = '2.
|
|
27
|
+
__version__ = '2.10.0'
|
|
27
28
|
__github__ = 'Https://GitHub.com/MPCodeWriter21/log21'
|
|
28
29
|
__all__ = [
|
|
29
30
|
'ColorizingStreamHandler', 'DecolorizingFileHandler', 'ColorizingFormatter',
|
|
@@ -35,7 +36,8 @@ __all__ = [
|
|
|
35
36
|
'debug', 'info', 'warning', 'warn', 'error', 'critical', 'fatal', 'exception',
|
|
36
37
|
'log', 'basic_config', 'basicConfig', 'ProgressBar', 'progress_bar',
|
|
37
38
|
'LoggingWindow', 'LoggingWindowHandler', 'get_logging_window', 'CrashReporter',
|
|
38
|
-
'console_reporter', 'file_reporter', 'argumentify'
|
|
39
|
+
'console_reporter', 'file_reporter', 'argumentify', 'ArgumentError',
|
|
40
|
+
'IncompatibleArguments', 'RequiredArgument', 'TooFewArguments'
|
|
39
41
|
]
|
|
40
42
|
|
|
41
43
|
_manager = Manager()
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
Metadata-Version: 2.1
|
|
2
2
|
Name: log21
|
|
3
|
-
Version: 2.
|
|
3
|
+
Version: 2.10.0
|
|
4
4
|
Summary: A simple logging package that helps you log colorized messages in Windows console.
|
|
5
5
|
Author-email: "CodeWriter21(Mehrad Pooryoussof)" <CodeWriter21@gmail.com>
|
|
6
6
|
License: Apache License 2.0
|
|
@@ -92,10 +92,11 @@ pip install git+https://github.com/MPCodeWriter21/log21
|
|
|
92
92
|
Changes
|
|
93
93
|
-------
|
|
94
94
|
|
|
95
|
-
### 2.
|
|
95
|
+
### 2.10.0
|
|
96
96
|
|
|
97
|
-
+ Added
|
|
98
|
-
|
|
97
|
+
+ Added some exception classes to raise in the "argumentified" functions to show
|
|
98
|
+
*parser error* to the user: `ArgumentError`, `IncompatibleArguments`,
|
|
99
|
+
`RequiredArgument`, `TooFewArguments`
|
|
99
100
|
|
|
100
101
|
[Full CHANGELOG](https://github.com/MPCodeWriter21/log21/blob/master/CHANGELOG.md)
|
|
101
102
|
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|