fix: Improved compatibility.

Author: MPCodeWriter21

CHANGELOG.md

@@ -5,6 +5,9 @@ Help this project by [Donation](DONATE.md)
 
 Changes
 -----------
+### 2.7.1
+
++ Improved compatibility
 
 ### 2.7.0
 

README.md

@@ -61,18 +61,9 @@ pip install git+https://github.com/MPCodeWriter21/log21
 Changes
 -------
 
-### 2.7.0
-
-+ Modified `automatic-release.yml` and `pypi.yml` workflows to check the
-  version.
-+ Added the support for more `type`s to pass to
-  `ColorizingArgumentParser().add_argument(...)`: `typing.Union`, `typing.Optional`,
-  `typing.Literal`, `enum.Enum`, `tuple` and `typing.Required`.
-+ Modified the way `Enum`s are handled in the Argument Parser.
-+ Handled some `typing._SpecialForm`s.
-+ A normal ArgumentGroup can now be required! (Unlike MutuallyExclusiveGroup it can 
-  have more than 1 option used at the same time)
-+ `argumentify` now supports async functions as the entry point.
+### 2.7.1
+
++ Improved compatibility
 
 [Full CHANGELOG](https://github.com/MPCodeWriter21/log21/blob/master/CHANGELOG.md)
 

pyproject.toml

@@ -26,7 +26,7 @@ dependencies = [
   "webcolors",
   "docstring-parser"
 ]
-version = "2.7.0"
+version = "2.7.1"
 
 [tool.setuptools.packages.find]
 where = ["src"]

src/log21/Argparse.py

@@ -1,18 +1,19 @@
 # log21.Argparse.py
 # CodeWriter21
 
+from __future__ import annotations
+
 import re as _re
 import sys as _sys
 import types as _types
 import typing as _typing
 import argparse as _argparse
 from enum import Enum as _Enum
+from typing import (Tuple as _Tuple, Mapping as _Mapping, Optional as _Optional,
+                    Sequence as _Sequence)
 from gettext import gettext as _gettext
 from textwrap import TextWrapper as _TextWrapper
 from collections import OrderedDict as _OrderedDict
-from typing import (
-    Mapping as _Mapping, Optional as _Optional, Tuple as _Tuple, Sequence as _Sequence
-)
 
 import log21 as _log21
 from log21.Colors import get_colors as _gc
@@ -485,11 +486,13 @@ def _wrap_chunks(self, chunks):  # noqa: C901
                 del chunks[-1]
 
             while chunks:
-                # modified upstream code, not going to refactor for ambiguous variable name.
+                # modified upstream code, not going to refactor for ambiguous variable
+                # name.
                 length = len(_Formatter.decolorize(chunks[-1]))  # noqa: E741
 
                 # Can at least squeeze this chunk onto the current line.
-                # Modified upstream code, not going to refactor for ambiguous variable name.
+                # Modified upstream code, not going to refactor for ambiguous variable
+                # name.
                 if current_len + length <= width:  # noqa: E741
                     current_line.append(chunks.pop())
                     current_len += length
@@ -545,35 +548,38 @@ class _ActionsContainer(_argparse._ActionsContainer):
     # pylint: disable=too-many-branches
     def _validate_func_type(self, action, func_type, kwargs, level: int = 0) -> _Tuple:
         # raise an error if the action type is not callable
-        if not callable(func_type) and not isinstance(func_type,
-                                                      (_types.UnionType, tuple)):
+        if (hasattr(_types, 'UnionType') and not callable(func_type)
+                and not isinstance(func_type, (_types.UnionType, tuple))):
             raise ValueError(f'{func_type} is not callable; level={level}')
 
         # Handle `UnionType` as a type (e.g. `int|str`)
-        if isinstance(func_type, _types.UnionType):
+        if hasattr(_types, 'UnionType') and isinstance(func_type, _types.UnionType):
             func_type = func_type.__args__  # type: ignore
 
         # Handle `Literal` as a type (e.g. `Literal[1, 2, 3]`)
-        elif isinstance(func_type, _typing._LiteralGenericAlias):
+        elif (hasattr(_typing, '_LiteralGenericAlias')
+              and isinstance(func_type, _typing._LiteralGenericAlias)):  # type: ignore
             func_type = Literal(func_type)
 
         # Handle `List` as a type (e.g. `List[int]`)
-        elif isinstance(func_type,
-                        _typing._GenericAlias) and func_type.__origin__ is list:
+        elif (hasattr(_typing, '_GenericAlias')
+              and isinstance(func_type, _typing._GenericAlias)  # type: ignore
+              and func_type.__origin__ is list):
             func_type = func_type.__args__[0]
             if kwargs.get('nargs') is None:
                 action.nargs = '+'
 
         # Handle `Required` as a type (e.g. `Required[int]`)
-        elif isinstance(
-                func_type,
-                _typing._GenericAlias) and func_type.__origin__ is _typing.Required:
+        elif (hasattr(_typing, 'Required') and hasattr(_typing, '_GenericAlias')
+              and isinstance(func_type, _typing._GenericAlias)  # type: ignore
+              and func_type.__origin__ is _typing.Required):
             func_type = func_type.__args__[0]
             action.required = True
 
         # Handle `Union` and `Optional` as a type (e.g. `Union[int, str]` and
         # `Optional[int]`)
-        elif isinstance(func_type, _typing._UnionGenericAlias):
+        elif (hasattr(_types, 'NoneType') and hasattr(_typing, '_UnionGenericAlias')
+              and isinstance(func_type, _typing._UnionGenericAlias)):  # type: ignore
             # Optional[T] is just Union[T, NoneType]
             # Optional
             if (len(func_type.__args__) == 2
@@ -620,12 +626,16 @@ def _validate_func_type(self, action, func_type, kwargs, level: int = 0) -> _Tup
                 temp.extend(self._validate_func_type(action, type_, kwargs, level + 1))
             func_type = tuple(temp)
         else:
-            if isinstance(func_type, (
-                    _typing._GenericAlias,
-                    _typing._UnionGenericAlias,
-                    _typing._LiteralGenericAlias,
-                    _types.UnionType,
-            )):
+            if (hasattr(_types, 'UnionType') and hasattr(_typing, '_GenericAlias')
+                    and hasattr(_typing, '_UnionGenericAlias')
+                    and hasattr(_typing, '_LiteralGenericAlias') and isinstance(
+                        func_type,
+                        (
+                            _typing._GenericAlias,  # type: ignore
+                            _typing._UnionGenericAlias,  # type: ignore
+                            _typing._LiteralGenericAlias,  # type: ignore
+                            _types.UnionType,
+                        ))):
                 func_type = self._validate_func_type(
                     action, func_type, kwargs, level + 1
                 )
@@ -744,8 +754,7 @@ def _get_formatter(self):
             return self.formatter_class(prog=self.prog)
 
     def _get_value(self, action, arg_string):
-        """Override _get_value to add support for types such as Union and
-        Literal."""
+        """Override _get_value to add support for types such as Union and Literal."""
 
         func_type = self._registry_get('type', action.type, action.type)
         if not callable(func_type) and not isinstance(func_type, tuple):
@@ -1079,7 +1088,8 @@ def consume_positionals(start_index):
         if required_actions:
             self.error(
                 _gettext(
-                    f'the following arguments are required: {", ".join(required_actions)}'
+                    'the following arguments are required: ' +
+                    ", ".join(required_actions)
                 )
             )
 

src/log21/CrashReporter/Reporters.py

@@ -322,10 +322,10 @@ class EmailReporter(Reporter):  # pylint: disable=too-many-instance-attributes
         >>> divide(10, 0)
         Traceback (most recent call last):
           File "<stdin>", line 1, in <module>
-          File "%localappdata%\\Programs\\Python\\Python310\\lib\\site-packages\\log21\\CrashReporter\\Reporters.py",
+          File ".../site-packages/log21/CrashReporter/Reporters.py",
            line 81, in wrap
             raise e
-          File "%localappdata%\\Programs\\Python\\Python310\\lib\\site-packages\\log21\\CrashReporter\\Reporters.py",
+          File ".../site-packages/log21/CrashReporter/Reporters.py",
            line 77, in wrap
             return func(*args, **kwargs)
           File "<stdin>", line 3, in divide