pyxcp 0.22.28__tar.gz → 0.22.30__tar.gz

{pyxcp-0.22.28 → pyxcp-0.22.30}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: pyxcp
-Version: 0.22.28
+Version: 0.22.30
 Summary: Universal Calibration Protocol for Python
 License: LGPLv3
 Keywords: automotive,ecu,xcp,asam,autosar

{pyxcp-0.22.28 → pyxcp-0.22.30}/pyproject.toml

@@ -37,7 +37,7 @@ dynamic = ["license", "readme", "authors", "requires-python", "description", "cl
 [tool.poetry]
 authors = ["Christoph Schueler <cpu.gems@googlemail.com>"]
 name = "pyxcp"
-version = "0.22.28"
+version = "0.22.30"
 readme = "README.md"
 description = "Universal Calibration Protocol for Python"
 keywords = ["automotive", "ecu", "xcp", "asam", "autosar"]

{pyxcp-0.22.28 → pyxcp-0.22.30}/pyxcp/__init__.py

@@ -17,4 +17,4 @@ tb_install(show_locals=True, max_frames=3)  # Install custom exception handler.
 
 # if you update this manually, do not forget to update
 # .bumpversion.cfg and pyproject.toml.
-__version__ = "0.22.28"
+__version__ = "0.22.30"

{pyxcp-0.22.28 → pyxcp-0.22.30}/pyxcp/master/master.py

@@ -113,6 +113,7 @@ class Master:
 
     def __enter__(self):
         """Context manager entry part."""
+        self.transport.connect()
         return self
 
     def __exit__(self, exc_type, exc_val, exc_tb):
@@ -171,8 +172,6 @@ class Master:
         more attempts to connect are silently ignored.
 
         """
-        self.transport.connect()
-
         response = self.transport.request(types.Command.CONNECT, mode & 0xFF)
 
         # First get byte-order
@@ -580,10 +579,10 @@ class Master:
         result = []
         for _ in chunks:
             data = self.upload(chunk_size)
-            result.extend(data)
+            result.extend(data[:chunk_size])
         if remaining:
             data = self.upload(remaining)
-            result.extend(data)
+            result.extend(data[:remaining])
         return bytes(result)
 
     pull = fetch  # fetch() may be completely replaced by pull() someday.

{pyxcp-0.22.28 → pyxcp-0.22.30}/pyxcp/transport/can.py

@@ -351,13 +351,11 @@ class Can(BaseTransport):
                     result[n] = value
             elif value is not None:
                 self.logger.warning(f"XCPonCAN - {self.interface_name!r} has no support for parameter {n!r}.")
-
         # Parameter names that need to be mapped.
         for base_name, name in can_interface_config_class.CAN_PARAM_MAP.items():
             value = getattr(self.config, base_name)
-            if value is not None:
+            if name is not None and value is not None:
                 result[name] = value
-
         # Interface specific parameters.
         cxx = getattr(self.config, self.interface_name)
         for name in can_interface_config_class.class_own_traits().keys():

{pyxcp-0.22.28 → pyxcp-0.22.30}/pyxcp/utils.py

@@ -1,5 +1,6 @@
 #!/usr/bin/env python
 import datetime
+from enum import IntEnum
 import functools
 import operator
 import sys
@@ -100,3 +101,27 @@ class CurrentDatetime(TimestampInfo):
     utc_offset={self.utc_offset},
     dst_offset={self.dst_offset}
 )"""
+
+
+def enum_from_str(enum_class: IntEnum, enumerator: str) -> IntEnum:
+    """Create an `IntEnum` instance from an enumerator `str`.
+
+    Parameters
+    ----------
+    enum_class: IntEnum
+
+    enumerator: str
+
+    Example
+    -------
+
+    class Color(enum.IntEnum):
+        RED = 0
+        GREEN = 1
+        BLUE = 2
+
+    color: Color = enum_from_str(Color, "GREEN")
+
+
+    """
+    return enum_class(enum_class.__members__.get(enumerator))