ae-base 0.3.67__tar.gz → 0.3.68__tar.gz

{ae_base-0.3.67 → ae_base-0.3.68}/LICENSE.md

@@ -1,4 +1,4 @@
-<!-- THIS FILE IS EXCLUSIVELY MAINTAINED by the project aedev.project_tpls v0.3.53 -->
+<!-- THIS FILE IS EXCLUSIVELY MAINTAINED by the project aedev.project_tpls v0.3.55 -->
 ### GNU GENERAL PUBLIC LICENSE
 
 Version 3, 29 June 2007

{ae_base-0.3.67/ae_base.egg-info → ae_base-0.3.68}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ae_base
-Version: 0.3.67
+Version: 0.3.68
 Summary: ae namespace module portion base: basic constants, helper functions and context managers
 Home-page: https://gitlab.com/ae-group/ae_base
 Author: AndiEcker
@@ -65,13 +65,13 @@ Dynamic: summary
 
 <!-- THIS FILE IS EXCLUSIVELY MAINTAINED by the project ae.ae v0.3.96 -->
 <!-- THIS FILE IS EXCLUSIVELY MAINTAINED by the project aedev.tpl_namespace_root V0.3.14 -->
-# base 0.3.67
+# base 0.3.68
 
 [![GitLab develop](https://img.shields.io/gitlab/pipeline/ae-group/ae_base/develop?logo=python)](
     https://gitlab.com/ae-group/ae_base)
 [![LatestPyPIrelease](
-    https://img.shields.io/gitlab/pipeline/ae-group/ae_base/release0.3.66?logo=python)](
-    https://gitlab.com/ae-group/ae_base/-/tree/release0.3.66)
+    https://img.shields.io/gitlab/pipeline/ae-group/ae_base/release0.3.67?logo=python)](
+    https://gitlab.com/ae-group/ae_base/-/tree/release0.3.67)
 [![PyPIVersions](https://img.shields.io/pypi/v/ae_base)](
     https://pypi.org/project/ae-base/#history)
 

{ae_base-0.3.67 → ae_base-0.3.68}/README.md

@@ -1,12 +1,12 @@
 <!-- THIS FILE IS EXCLUSIVELY MAINTAINED by the project ae.ae v0.3.96 -->
 <!-- THIS FILE IS EXCLUSIVELY MAINTAINED by the project aedev.tpl_namespace_root V0.3.14 -->
-# base 0.3.67
+# base 0.3.68
 
 [![GitLab develop](https://img.shields.io/gitlab/pipeline/ae-group/ae_base/develop?logo=python)](
     https://gitlab.com/ae-group/ae_base)
 [![LatestPyPIrelease](
-    https://img.shields.io/gitlab/pipeline/ae-group/ae_base/release0.3.66?logo=python)](
-    https://gitlab.com/ae-group/ae_base/-/tree/release0.3.66)
+    https://img.shields.io/gitlab/pipeline/ae-group/ae_base/release0.3.67?logo=python)](
+    https://gitlab.com/ae-group/ae_base/-/tree/release0.3.67)
 [![PyPIVersions](https://img.shields.io/pypi/v/ae_base)](
     https://pypi.org/project/ae-base/#history)
 

{ae_base-0.3.67 → ae_base-0.3.68}/ae/base.py

@@ -245,7 +245,7 @@ from types import ModuleType
 from typing import Any, Callable, Generator, Iterable, MutableMapping, Optional, Union, cast
 
 
-__version__ = '0.3.67'
+__version__ = '0.3.68'
 
 
 os_path_abspath = os.path.abspath
@@ -428,7 +428,6 @@ def deep_dict_update(data: dict, update: dict, overwrite: bool = True):
             data[upd_key] = upd_val
 
 
-URI_SEP_CHAR = '⫻'  # U+2AFB: TRIPLE SOLIDUS BINARY RELATION
 # noinspection GrazieInspection
 ASCII_UNICODE = (
     ('/', '⁄'),     # U+2044: Fraction Slash; '∕' U+2215: Division Slash; '⧸' U+29F8: Big Solidus;
@@ -466,13 +465,19 @@ ASCII_UNICODE = (
                     # ' ' U+202F: Narrow No-Break Space (NNBSP); ' ' U+205F Medium Mathematical Space;
                     # '␠' U+2420 symbol for space; '␣' U+2423 Open Box; '　' U+3000: Ideographic Space
     (chr(127), '␡'),  # U+2421: DELETE SYMBOL
-    # ('_', '𛲖'), # U+1BC96: Duployan Affix Low Line; '＿' U+FF3F Fullwidth Low Line
-)
-""" transformation table of special ASCII to Unicode alternative character,
+    # ('_', '𛲖'),     # U+1BC96: Duployan Affix Low Line; '＿' U+FF3F Fullwidth Low Line
+) + tuple((chr(low_asc_ord), chr(0x2400 + low_asc_ord)) for low_asc_ord in range(32))
+""" transformation table of special ASCII characters to a similar/alternative non-functional/-escaping Unicode char,
 see https://www.compart.com/en/unicode/category/Po and https://xahlee.info/comp/unicode_naming_slash.html (http!) """
 
-ASCII_TO_UNICODE = dict(ASCII_UNICODE)  #: map to convert ASCII to an alternative defused Unicode character
-UNICODE_TO_ASCII = {unicode_char: ascii_char for ascii_char, unicode_char in ASCII_UNICODE}     #: Unicode to ASCII map
+URI_SEP_STR = '://'             #: separator between service and address(host/path) in URIs
+URI_SEP_UNICODE_CHAR = '⫻'      #: single Unicode char for :data:`URI_SEP_STR`  U+2AFB: TRIPLE SOLIDUS BINARY RELATION
+
+ASCII_TO_UNICODE = str.maketrans(dict(ASCII_UNICODE))
+""" :func:`str.translate` map to convert ASCII to an alternative defused Unicode character - used by :func:`defuse` """
+UNICODE_TO_ASCII = str.maketrans({unicode_char: ascii_char for ascii_char, unicode_char in
+                                  ASCII_UNICODE + ((URI_SEP_STR, URI_SEP_UNICODE_CHAR), )})
+""" :func:`str.translate` Unicode to ASCII map - used by :func:`dedefuse` """
 
 
 def dedefuse(value: str) -> str:
@@ -481,15 +486,7 @@ def dedefuse(value: str) -> str:
     :param value:               string defused with the function :func:`defuse`.
     :return:                    re-activated form of the string (with all ASCII special characters recovered).
     """
-    original = ""
-    for char in value:
-        if char in UNICODE_TO_ASCII:
-            char = UNICODE_TO_ASCII[char]
-        elif 0x2400 <= (code := ord(char)) <= 0x241F:
-            char = chr(code - 0x2400)
-        original += char
-
-    return original.replace(URI_SEP_CHAR, '://')
+    return value.translate(UNICODE_TO_ASCII)
 
 
 def defuse(value: str) -> str:
@@ -515,15 +512,7 @@ def defuse(value: str) -> str:
     .. hint:: use the :func:`dedefuse` function to convert the defused string back to the corresponding URI/file-path.
 
     """
-    defused = ""
-    value = value.replace('://', URI_SEP_CHAR)  # make URIs shorter
-    for char in value:
-        if char in ASCII_TO_UNICODE:
-            char = ASCII_TO_UNICODE[char]
-        elif (code := ord(char)) <= 31:
-            char = chr(0x2400 + code)
-        defused += char
-    return defused
+    return value.replace(URI_SEP_STR, URI_SEP_UNICODE_CHAR).translate(ASCII_TO_UNICODE)  # replace makes URIs shorter
 
 
 def dummy_function(*_args, **_kwargs):

{ae_base-0.3.67 → ae_base-0.3.68/ae_base.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ae_base
-Version: 0.3.67
+Version: 0.3.68
 Summary: ae namespace module portion base: basic constants, helper functions and context managers
 Home-page: https://gitlab.com/ae-group/ae_base
 Author: AndiEcker
@@ -65,13 +65,13 @@ Dynamic: summary
 
 <!-- THIS FILE IS EXCLUSIVELY MAINTAINED by the project ae.ae v0.3.96 -->
 <!-- THIS FILE IS EXCLUSIVELY MAINTAINED by the project aedev.tpl_namespace_root V0.3.14 -->
-# base 0.3.67
+# base 0.3.68
 
 [![GitLab develop](https://img.shields.io/gitlab/pipeline/ae-group/ae_base/develop?logo=python)](
     https://gitlab.com/ae-group/ae_base)
 [![LatestPyPIrelease](
-    https://img.shields.io/gitlab/pipeline/ae-group/ae_base/release0.3.66?logo=python)](
-    https://gitlab.com/ae-group/ae_base/-/tree/release0.3.66)
+    https://img.shields.io/gitlab/pipeline/ae-group/ae_base/release0.3.67?logo=python)](
+    https://gitlab.com/ae-group/ae_base/-/tree/release0.3.67)
 [![PyPIVersions](https://img.shields.io/pypi/v/ae_base)](
     https://pypi.org/project/ae-base/#history)
 

{ae_base-0.3.67 → ae_base-0.3.68}/pyproject.toml

@@ -1,4 +1,4 @@
-# THIS FILE IS EXCLUSIVELY MAINTAINED by the project aedev.project_tpls v0.3.53
+# THIS FILE IS EXCLUSIVELY MAINTAINED by the project aedev.project_tpls v0.3.55
 [build-system]
 requires = ["setuptools>=42", "wheel"]
 build-backend = "setuptools.build_meta"

{ae_base-0.3.67 → ae_base-0.3.68}/setup.py

@@ -1,4 +1,4 @@
-# THIS FILE IS EXCLUSIVELY MAINTAINED by the project aedev.project_tpls v0.3.53
+# THIS FILE IS EXCLUSIVELY MAINTAINED by the project aedev.project_tpls v0.3.55
 """ setup of ae namespace module portion base: basic constants, helper functions and context managers. """
 # noinspection PyUnresolvedReferences
 import sys
@@ -25,13 +25,13 @@ setup_kwargs = {
     'license': 'GPL-3.0-or-later',
     'long_description': ('<!-- THIS FILE IS EXCLUSIVELY MAINTAINED by the project ae.ae v0.3.96 -->\n'
  '<!-- THIS FILE IS EXCLUSIVELY MAINTAINED by the project aedev.tpl_namespace_root V0.3.14 -->\n'
- '# base 0.3.67\n'
+ '# base 0.3.68\n'
  '\n'
  '[![GitLab develop](https://img.shields.io/gitlab/pipeline/ae-group/ae_base/develop?logo=python)](\n'
  '    https://gitlab.com/ae-group/ae_base)\n'
  '[![LatestPyPIrelease](\n'
- '    https://img.shields.io/gitlab/pipeline/ae-group/ae_base/release0.3.66?logo=python)](\n'
- '    https://gitlab.com/ae-group/ae_base/-/tree/release0.3.66)\n'
+ '    https://img.shields.io/gitlab/pipeline/ae-group/ae_base/release0.3.67?logo=python)](\n'
+ '    https://gitlab.com/ae-group/ae_base/-/tree/release0.3.67)\n'
  '[![PyPIVersions](https://img.shields.io/pypi/v/ae_base)](\n'
  '    https://pypi.org/project/ae-base/#history)\n'
  '\n'
@@ -108,7 +108,7 @@ setup_kwargs = {
         'Source': 'https://ae.readthedocs.io/en/latest/_modules/ae/base.html'},
     'python_requires': '>=3.9',
     'url': 'https://gitlab.com/ae-group/ae_base',
-    'version': '0.3.67',
+    'version': '0.3.68',
     'zip_safe': True,
 }
 

{ae_base-0.3.67 → ae_base-0.3.68}/tests/test_base.py

@@ -21,8 +21,8 @@ from urllib.error import HTTPError, URLError
 
 # noinspection PyProtectedMember
 from ae.base import (
-    ASCII_TO_UNICODE, BUILD_CONFIG_FILE, DOTENV_FILE_NAME, PY_EXT, PY_INIT, PY_MAIN, TESTS_FOLDER, UNICODE_TO_ASCII,
-    UNSET, URI_SEP_CHAR,
+    ASCII_TO_UNICODE, ASCII_UNICODE, BUILD_CONFIG_FILE, DOTENV_FILE_NAME, PY_EXT, PY_INIT, PY_MAIN, TESTS_FOLDER,
+    UNICODE_TO_ASCII, UNSET, URI_SEP_STR, URI_SEP_UNICODE_CHAR,
     app_name_guess, ascii_str, build_config_variable_values, camel_to_snake,
     dedefuse, deep_dict_update, defuse, dummy_function, duplicates, env_str, evaluate_literal,
     force_encoding, format_given, full_stack_trace, import_module, instantiate_config_parser, in_wd,
@@ -157,11 +157,11 @@ class TestBaseHelpers:
         assert all(ord(_) >= 128 for _ in uni_str)
         assert all(ord(_) < 128 for _ in ascii_str(uni_str))
 
-        uni_str = "".join(UNICODE_TO_ASCII.keys())
+        uni_str = "".join(_uco for _asc, _uco in ASCII_UNICODE)
         assert any(ord(_) >= 128 for _ in uni_str)
         assert all(ord(_) < 128 for _ in ascii_str(uni_str))
 
-        asc_str = "".join(ASCII_TO_UNICODE.keys())
+        asc_str = "".join(_asc for _asc, _uco in ASCII_UNICODE)
         assert any(ord(_) < 128 for _ in asc_str)
         assert all(ord(_) < 128 for _ in ascii_str(asc_str))
 
@@ -172,10 +172,10 @@ class TestBaseHelpers:
         uni_str = "äÄßéÉíÍñÑòÒùÙ"
         assert str_ascii(ascii_str(uni_str)) == uni_str
 
-        uni_str = "".join(UNICODE_TO_ASCII.keys())
+        uni_str = "".join(_uco for _asc, _uco in ASCII_UNICODE)
         assert str_ascii(ascii_str(uni_str)) == uni_str
 
-        asc_str = "".join(ASCII_TO_UNICODE.keys())
+        asc_str = "".join(_asc for _asc, _uco in ASCII_UNICODE)
         assert str_ascii(ascii_str(asc_str)) == asc_str
 
     def test_str_ascii_errors(self):
@@ -320,16 +320,18 @@ class TestBaseHelpers:
                 os.remove(tst_fna2)
 
     def test_defuse_maps_integrity(self):
-        assert URI_SEP_CHAR not in UNICODE_TO_ASCII
-        assert len(UNICODE_TO_ASCII) == len(ASCII_TO_UNICODE)   # check for duplicates in the ASCII_UNICODE map
+        assert len(ASCII_TO_UNICODE) == len(ASCII_UNICODE)      # duplicates check in ASCII_UNICODE map
+        assert len(UNICODE_TO_ASCII) == len(ASCII_UNICODE) + 1  # -"-, having also the ord(URI_SEP_UNICODE_CHAR) key
+        assert ord(URI_SEP_UNICODE_CHAR) in UNICODE_TO_ASCII
+        assert UNICODE_TO_ASCII[ord(URI_SEP_UNICODE_CHAR)] == URI_SEP_STR
 
     def test_defuse_maps_not_touching_chars_allowed_as_slug_and_filename(self):
-        assert '-' not in ASCII_TO_UNICODE
-        assert '_' not in ASCII_TO_UNICODE
-        assert '.' not in ASCII_TO_UNICODE
-        assert '~' not in ASCII_TO_UNICODE
+        assert ord('-') not in ASCII_TO_UNICODE
+        assert ord('_') not in ASCII_TO_UNICODE
+        assert ord('.') not in ASCII_TO_UNICODE
+        assert ord('~') not in ASCII_TO_UNICODE
         for char in string.ascii_letters + string.digits:
-            assert char not in ASCII_TO_UNICODE
+            assert ord(char) not in ASCII_TO_UNICODE
 
     def test_dummy_function(self):
         assert dummy_function() is None