PythonExtensionsCollection 0.15.0__py3-none-any.whl → 0.16.0__py3-none-any.whl

PythonExtensionsCollection/Comparison/CComparison.py

@@ -1,6 +1,6 @@
 # **************************************************************************************************************
 #
-#  Copyright 2020-2022 Robert Bosch GmbH
+#  Copyright 2020-2024 Robert Bosch GmbH
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.
@@ -18,7 +18,7 @@
 #
 # CComparison.py
 #
-# XC-CT/ECA3-Queckenstedt
+# XC-HWP/ESW3-Queckenstedt
 #
 # 03.04.2023
 #

PythonExtensionsCollection/Comparison/__init__.py

@@ -1,4 +1,4 @@
-#  Copyright 2020-2022 Robert Bosch GmbH
+#  Copyright 2020-2024 Robert Bosch GmbH
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.

PythonExtensionsCollection/File/CFile.py

@@ -1,6 +1,6 @@
 # **************************************************************************************************************
 #
-#  Copyright 2020-2022 Robert Bosch GmbH
+#  Copyright 2020-2024 Robert Bosch GmbH
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.
@@ -18,7 +18,7 @@
 #
 # CFile.py
 #
-# XC-CT/ECA3-Queckenstedt
+# XC-HWP/ESW3-Queckenstedt
 #
 # 15.11.2022
 #

PythonExtensionsCollection/File/__init__.py

@@ -1,4 +1,4 @@
-#  Copyright 2020-2022 Robert Bosch GmbH
+#  Copyright 2020-2024 Robert Bosch GmbH
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.

PythonExtensionsCollection/Folder/CFolder.py

@@ -1,6 +1,6 @@
 # **************************************************************************************************************
 #
-#  Copyright 2020-2022 Robert Bosch GmbH
+#  Copyright 2020-2024 Robert Bosch GmbH
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.
@@ -18,7 +18,7 @@
 #
 # CFolder.py
 #
-# XC-CT/ECA3-Queckenstedt
+# XC-HWP/ESW3-Queckenstedt
 #
 # 28.06.2022
 #

PythonExtensionsCollection/Folder/__init__.py

@@ -1,4 +1,4 @@
-#  Copyright 2020-2022 Robert Bosch GmbH
+#  Copyright 2020-2024 Robert Bosch GmbH
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.

PythonExtensionsCollection/String/CString.py

@@ -1,6 +1,6 @@
 # **************************************************************************************************************
 #
-#  Copyright 2020-2022 Robert Bosch GmbH
+#  Copyright 2020-2024 Robert Bosch GmbH
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.
@@ -18,14 +18,14 @@
 #
 # CString.py
 #
-# XC-CT/ECA3-Queckenstedt
+# XC-HWP/ESW3-Queckenstedt
 #
-# 14.11.2022
+# 19.10.2023
 #
 # **************************************************************************************************************
 
 # -- import standard Python modules
-import os, ntpath, re
+import os, ntpath, platform, re
 
 # **************************************************************************************************************
 
@@ -47,7 +47,8 @@ Normalizes local paths, paths to local network resources and internet addresses
 
   / *Condition*: required / *Type*: str /
 
-  The path to be normalized
+  The path to be normalized. Paths can start with environment variables. Accepted are notations for both Windows
+  (``%ENVVAR%``) and Linux (``${ENVVAR}``). Under Windows also the Linux notation will be resolved.
 
 * ``bWin``
 
@@ -94,10 +95,6 @@ Normalizes local paths, paths to local network resources and internet addresses
 
       if sPath is not None:
 
-         # -- expand Windows environment variables
-         if bExpandEnvVars is True:
-            sPath = os.path.expandvars(sPath)
-
          # - remove leading and trailing horizontal space
          sPath = sPath.strip(" \t\r\n")
 
@@ -115,6 +112,20 @@ Normalizes local paths, paths to local network resources and internet addresses
          # - remove trailing slash or backslash (maybe at end of path to folder)
          sPath = sPath.rstrip("/\\")
 
+         # -- expand environment variables
+         if bExpandEnvVars is True:
+            sPattern_envvar = r"^\$\{(\w+?)\}" # check for Linux notation (shall be usable also under Windows)
+            regex_envvar    = re.compile(sPattern_envvar)
+            sPlatformSystem = platform.system()
+            sPathModified = sPath
+            for sEnvVar in regex_envvar.findall(sPath):
+               sSearch = "${" + sEnvVar + "}"
+               if sPlatformSystem == "Windows":
+                  sReplace = "%" + sEnvVar + "%"
+                  sPathModified = sPathModified.replace(sSearch, sReplace)
+            # eof for sEnvVar in regex_envvar.findall(sPath):
+            sPath = os.path.expandvars(sPathModified)
+
          # --------------------------------------------------------------------------------------------------------------
          # consider internet addresses and local network resources
          # --------------------------------------------------------------------------------------------------------------
@@ -480,7 +491,7 @@ while walking through the file system.
 
   / *Condition*: required / *Type*: str /
 
-  The input string that has to be investigated. 
+  The input string that has to be investigated.
 
 * ``bCaseSensitive``
 

PythonExtensionsCollection/String/__init__.py

@@ -1,4 +1,4 @@
-#  Copyright 2020-2022 Robert Bosch GmbH
+#  Copyright 2020-2024 Robert Bosch GmbH
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.

PythonExtensionsCollection/Utils/CUtils.py

@@ -1,6 +1,6 @@
 # **************************************************************************************************************
 #
-#  Copyright 2020-2022 Robert Bosch GmbH
+#  Copyright 2020-2025 Robert Bosch GmbH
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.
@@ -18,9 +18,9 @@
 #
 # CUtils.py
 #
-# XC-CT/ECA3-Queckenstedt
+# XC-HWP/ESW3-Queckenstedt
 #
-# 30.05.2023
+# 29.01.2025
 #
 # **************************************************************************************************************
 
@@ -30,6 +30,8 @@ from dotdict import dotdict
 
 from PythonExtensionsCollection.String.CString import CString
 from PythonExtensionsCollection.File.CFile import CFile
+from PythonExtensionsCollection.version import VERSION
+from PythonExtensionsCollection.version import VERSION_DATE
 
 
 # **************************************************************************************************************
@@ -293,7 +295,8 @@ The method ``TypePrint`` computes details about the input variable ``oData``.
                del self.listGlobalPrefixes[-1]    # remove prefix count
             del self.listGlobalPrefixes[-1]       # remove prefix name
 
-      elif ( (type(oData) is dotdict) or (str(type(oData)) == "<class 'robot.utils.dotdict.DotDict'>") ):
+      # previous version # elif ( (type(oData) is dotdict) or (".DotDict'>" in str(type(oData))) ):
+      elif ( (type(oData) is dotdict) or (str(type(oData)).upper().find("DOTDICT") != -1) ):
          nNrOfElements = len(oData)
          if nNrOfElements == 0:
             # -- indicate empty dot dictionary
@@ -330,7 +333,6 @@ The method ``TypePrint`` computes details about the input variable ``oData``.
 
 # eof class CTypePrint():
 
-
 # --------------------------------------------------------------------------------------------------------------
 # TM***
 
@@ -437,12 +439,26 @@ It is also possible to let the method dump the list to a text file.
 
    # eof def GetInstalledPackages(sOutputFile=None):
 
+   def GetComponentName():
+      """**Returns:**
+
+* ``ComponentName``
+
+  / *Type*: str /
+
+  Full name of the component including the version and the version date.
+      """
+      return f"PythonExtensionsCollection v. {VERSION}, {VERSION_DATE}"
+
+   #eof def GetComponentName():
+
    # --------------------------------------------------------------------------------------------------------------
    #TM***
 
    # - make the methods static
 
    GetInstalledPackages = staticmethod(GetInstalledPackages)
+   GetComponentName     = staticmethod(GetComponentName)
 
 # eof class CUtils(object):
 

PythonExtensionsCollection/Utils/__init__.py

@@ -1,4 +1,4 @@
-#  Copyright 2020-2022 Robert Bosch GmbH
+#  Copyright 2020-2024 Robert Bosch GmbH
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.

PythonExtensionsCollection/__init__.py

@@ -1,4 +1,4 @@
-#  Copyright 2020-2022 Robert Bosch GmbH
+#  Copyright 2020-2024 Robert Bosch GmbH
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.

PythonExtensionsCollection/version.py

@@ -1,6 +1,6 @@
 # **************************************************************************************************************
 #
-#  Copyright 2020-2022 Robert Bosch GmbH
+#  Copyright 2020-2024 Robert Bosch GmbH
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.
@@ -18,6 +18,6 @@
 #
 # Version and date of PythonExtensionsCollection
 #
-VERSION      = "0.15.0"
-VERSION_DATE = "30.05.2023"
+VERSION      = "0.16.0"
+VERSION_DATE = "29.01.2025"
 

{PythonExtensionsCollection-0.15.0.dist-info → PythonExtensionsCollection-0.16.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PythonExtensionsCollection
-Version: 0.15.0
+Version: 0.16.0
 Summary: Additional Python functions
 Home-page: https://github.com/test-fullautomation/python-extensions-collection
 Author: Holger Queckenstedt
@@ -18,21 +18,19 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: dotdict
 
-Package Description
-===================
+# Package Description
 
 The **PythonExtensionsCollection** extends the functionality of Python
 by some useful functions that are not available in Python immediately.
 
-How to install
---------------
+## How to install
 
 The **PythonExtensionsCollection** can be installed in two different
 ways.
 
 1.  Installation via PyPi (recommended for users)
 
-    ``` {.}
+    ``` 
     pip install PythonExtensionsCollection
     ```
 
@@ -44,7 +42,7 @@ ways.
     -   Clone the **python-extensions-collection** repository to your
         machine.
 
-        ``` {.}
+        ``` 
         git clone https://github.com/test-fullautomation/python-extensions-collection.git
         ```
 
@@ -59,7 +57,7 @@ ways.
         related packages you can find in the file `requirements.txt` in
         the repository root folder. Use pip to install them:
 
-        ``` {.}
+        ``` 
         pip install -r ./requirements.txt
         ```
 
@@ -78,7 +76,7 @@ ways.
         to find **LaTeX**. This is defined in the **GenPackageDoc**
         configuration file
 
-        ``` {.}
+        ``` 
         packagedoc\packagedoc_config.json
         ```
 
@@ -91,19 +89,17 @@ ways.
     -   Use the following command to install the
         **PythonExtensionsCollection**:
 
-        ``` {.}
+        ``` 
         setup.py install
         ```
 
-Package Documentation
----------------------
+## Package Documentation
 
 A detailed documentation of the **PythonExtensionsCollection** can be
 found here:
 [PythonExtensionsCollection.pdf](https://github.com/test-fullautomation/python-extensions-collection/blob/develop/PythonExtensionsCollection/PythonExtensionsCollection.pdf)
 
-Feedback
---------
+## Feedback
 
 To give us a feedback, you can send an email to [Thomas
 Pollerspöck](mailto:Thomas.Pollerspoeck@de.bosch.com)
@@ -111,24 +107,21 @@ Pollerspöck](mailto:Thomas.Pollerspoeck@de.bosch.com)
 In case you want to report a bug or request any interesting feature,
 please don\'t hesitate to raise a ticket.
 
-Maintainers
------------
+## Maintainers
 
 [Holger Queckenstedt](mailto:Holger.Queckenstedt@de.bosch.com)
 
 [Thomas Pollerspöck](mailto:Thomas.Pollerspoeck@de.bosch.com)
 
-Contributors
-------------
+## Contributors
 
 [Holger Queckenstedt](mailto:Holger.Queckenstedt@de.bosch.com)
 
 [Thomas Pollerspöck](mailto:Thomas.Pollerspoeck@de.bosch.com)
 
-License
--------
+## License
 
-Copyright 2020-2022 Robert Bosch GmbH
+Copyright 2020-2024 Robert Bosch GmbH
 
 Licensed under the Apache License, Version 2.0 (the \"License\"); you
 may not use this file except in compliance with the License. You may

PythonExtensionsCollection-0.16.0.dist-info/RECORD

@@ -0,0 +1,18 @@
+PythonExtensionsCollection/PythonExtensionsCollection.pdf,sha256=cqXo9geIh3Zq28yep8xlqPVic26qdyCXpcz9kfrtA6Q,288293
+PythonExtensionsCollection/__init__.py,sha256=a6qP310WpO1pwWYLuGFyhneeD55p6HV4VlQ7RdK4Brw,596
+PythonExtensionsCollection/version.py,sha256=aJ-E9N0REHbut9QXDaG-kZKG45j8r4AtnJP96N38NxE,932
+PythonExtensionsCollection/Comparison/CComparison.py,sha256=NKBdHlWwMGk52UwrCWIG-rRTYv6W7_Q_pPr9vyfHcMA,12553
+PythonExtensionsCollection/Comparison/__init__.py,sha256=a6qP310WpO1pwWYLuGFyhneeD55p6HV4VlQ7RdK4Brw,596
+PythonExtensionsCollection/File/CFile.py,sha256=ykQbZnmaKCXluQbm7T5sLODUFfVnBgB19LwgGp6iEP0,36383
+PythonExtensionsCollection/File/__init__.py,sha256=a6qP310WpO1pwWYLuGFyhneeD55p6HV4VlQ7RdK4Brw,596
+PythonExtensionsCollection/Folder/CFolder.py,sha256=0991d_OXQKG8FL0AGBrouApsgyLmithwaokhTKvQ6q0,15986
+PythonExtensionsCollection/Folder/__init__.py,sha256=a6qP310WpO1pwWYLuGFyhneeD55p6HV4VlQ7RdK4Brw,596
+PythonExtensionsCollection/String/CString.py,sha256=OyMtfYf89DyfPqzS_Y3Nw2lsMmzv324Pagx6SH6IhiI,38424
+PythonExtensionsCollection/String/__init__.py,sha256=a6qP310WpO1pwWYLuGFyhneeD55p6HV4VlQ7RdK4Brw,596
+PythonExtensionsCollection/Utils/CUtils.py,sha256=EhVrSMeBWSBuD6ewbuMVtU7CumHP4eyDoSukGw5PHUw,15976
+PythonExtensionsCollection/Utils/__init__.py,sha256=a6qP310WpO1pwWYLuGFyhneeD55p6HV4VlQ7RdK4Brw,596
+PythonExtensionsCollection-0.16.0.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+PythonExtensionsCollection-0.16.0.dist-info/METADATA,sha256=XqB5eKtNuNoT4K1cFjNpaKW0o83TKxQ4MUuXJ4vkupw,4549
+PythonExtensionsCollection-0.16.0.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+PythonExtensionsCollection-0.16.0.dist-info/top_level.txt,sha256=xv5w-C3GQkdbxctBNzEqPfWvpJ1kpAaHBe3TEdGcozQ,27
+PythonExtensionsCollection-0.16.0.dist-info/RECORD,,

{PythonExtensionsCollection-0.15.0.dist-info → PythonExtensionsCollection-0.16.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.40.0)
+Generator: bdist_wheel (0.45.1)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

PythonExtensionsCollection-0.15.0.dist-info/RECORD

@@ -1,18 +0,0 @@
-PythonExtensionsCollection/PythonExtensionsCollection.pdf,sha256=zb8lcIG2c5QQdgn3R2WWwTPGe-z60FZaDIJidRN4zN4,277904
-PythonExtensionsCollection/__init__.py,sha256=hr5YI0Et3k8uubFLR_hLILpLtqgnJvEYil0neGoKXhA,596
-PythonExtensionsCollection/version.py,sha256=08Qo57bGo_oa7aL__KG5ue9zvop2uOdPaEji--jiT1k,932
-PythonExtensionsCollection/Comparison/CComparison.py,sha256=QS9ianplFbS8aN1oT8ax2kgh1TT6lE1djQhljJqloCQ,12552
-PythonExtensionsCollection/Comparison/__init__.py,sha256=hr5YI0Et3k8uubFLR_hLILpLtqgnJvEYil0neGoKXhA,596
-PythonExtensionsCollection/File/CFile.py,sha256=vLEmVnYowxqLilEtQmPuomUBiyABEtnUu5XFZW27skU,36382
-PythonExtensionsCollection/File/__init__.py,sha256=hr5YI0Et3k8uubFLR_hLILpLtqgnJvEYil0neGoKXhA,596
-PythonExtensionsCollection/Folder/CFolder.py,sha256=WUMITkZnpPNdxGPZraPsmxe0IzGmlZBbeEwiKv4AR7o,15985
-PythonExtensionsCollection/Folder/__init__.py,sha256=hr5YI0Et3k8uubFLR_hLILpLtqgnJvEYil0neGoKXhA,596
-PythonExtensionsCollection/String/CString.py,sha256=iJxfMW5NwJ5Mc9sFqHMWrNMTfH2KgAzPj19Mask4cig,37642
-PythonExtensionsCollection/String/__init__.py,sha256=hr5YI0Et3k8uubFLR_hLILpLtqgnJvEYil0neGoKXhA,596
-PythonExtensionsCollection/Utils/CUtils.py,sha256=-vEz6g4yIUAIqqQbZjemJpihvF7hIKksg501AGtVp2g,15438
-PythonExtensionsCollection/Utils/__init__.py,sha256=hr5YI0Et3k8uubFLR_hLILpLtqgnJvEYil0neGoKXhA,596
-PythonExtensionsCollection-0.15.0.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-PythonExtensionsCollection-0.15.0.dist-info/METADATA,sha256=70SYcgawBuDIMC0DpaZ5UF-V0Lv1WW-n488GGZgoKbk,4643
-PythonExtensionsCollection-0.15.0.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
-PythonExtensionsCollection-0.15.0.dist-info/top_level.txt,sha256=xv5w-C3GQkdbxctBNzEqPfWvpJ1kpAaHBe3TEdGcozQ,27
-PythonExtensionsCollection-0.15.0.dist-info/RECORD,,