odxtools 5.2.4__py3-none-any.whl → 5.2.6__py3-none-any.whl

odxtools/nameditemlist.py

@@ -4,7 +4,7 @@ from keyword import iskeyword
 from typing import (Callable, Collection, Generic, Iterable, List, Optional, Protocol, Tuple,
                     TypeVar, Union, cast, overload, runtime_checkable)
 
-from .exceptions import odxassert, odxraise
+from .exceptions import odxraise
 
 
 @runtime_checkable
@@ -168,7 +168,7 @@ def short_name_as_key(obj: OdxNamed) -> str:
 
     Although short names are almost identical to python identifiers,
     their first character is allowed to be a number. This method
-    prepends an underscore to such such shortnames.
+    prepends an underscore to such shortnames.
     """
     if not isinstance(obj, OdxNamed):
         odxraise()
@@ -176,21 +176,12 @@ def short_name_as_key(obj: OdxNamed) -> str:
     if not isinstance(sn, str):
         odxraise()
 
-    odxassert(
-        sn.isidentifier(),
-        message=("For NamedItemList objects to work properly, "
-                 "all item names must be valid python identifiers."
-                 f"Encountered name '{sn}' which is not an identifier!"),
-    )
-
-    if sn[0].isdigit():
+    # make sure that the name of the item in question:
+    # * is not a python keyword (this would lead to syntax errors)
+    # * does not starts with a digit
+    if sn[0].isdigit() or iskeyword(sn):
         return f"_{sn}"
 
-    # make sure that the name of the item in question is not a
-    # python keyword (this would lead to syntax errors)
-    if iskeyword(sn):
-        return f"{sn}_"
-
     return sn
 
 

odxtools/progcode.py

@@ -11,17 +11,11 @@ if TYPE_CHECKING:
     from .diaglayer import DiagLayer
 
 
-class ProgCodeSyntax(Enum):
-    JAVA = "JAVA"
-    CLASS = "CLASS"
-    JAR = "JAR"
-
-
 @dataclass
 class ProgCode:
     """A reference to code that is executed by a single ECU job"""
     code_file: str
-    syntax: ProgCodeSyntax
+    syntax: str
     revision: str
     encryption: Optional[str]
     entrypoint: Optional[str]
@@ -32,14 +26,7 @@ class ProgCode:
         code_file = odxrequire(et_element.findtext("CODE-FILE"))
 
         encryption = et_element.findtext("ENCRYPTION")
-
-        syntax_str = odxrequire(et_element.findtext("SYNTAX"))
-        try:
-            syntax = ProgCodeSyntax(syntax_str)
-        except ValueError:
-            syntax = cast(ProgCodeSyntax, None)
-            odxraise(f"Encountered unknown program code syntax '{syntax_str}'")
-
+        syntax = odxrequire(et_element.findtext("SYNTAX"))
         revision = odxrequire(et_element.findtext("REVISION"))
         entrypoint = et_element.findtext("ENTRYPOINT")
 

odxtools/templates/macros/printSingleEcuJob.xml.jinja2

@@ -63,7 +63,7 @@
 {%- if prog.encryption %}
  <ENCRYPTION>{{prog.encryption}}</ENCRYPTION>
 {%- endif %}
- <SYNTAX>{{prog.syntax.value}}</SYNTAX>
+ <SYNTAX>{{prog.syntax}}</SYNTAX>
  <REVISION>{{prog.revision}}</REVISION>
 {%- if prog.entrypoint %}
  <ENTRYPOINT>{{prog.entrypoint}}</ENTRYPOINT>

odxtools/version.py

@@ -1,4 +1,4 @@
 # file generated by setuptools_scm
 # don't change, don't track in version control
-__version__ = version = '5.2.4'
-__version_tuple__ = version_tuple = (5, 2, 4)
+__version__ = version = '5.2.6'
+__version_tuple__ = version_tuple = (5, 2, 6)

{odxtools-5.2.4.dist-info → odxtools-5.2.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: odxtools
-Version: 5.2.4
+Version: 5.2.6
 Summary: Utilities to work with the ODX standard for automotive diagnostics
 Author-email: Katrin Bauer <katrin.bauer@mbition.io>, Andreas Lauser <andreas.lauser@mbition.io>, Ayoub Kaanich <kayoub5@live.com>
 Maintainer-email: Andreas Lauser <andreas.lauser@mbition.io>, Ayoub Kaanich <kayoub5@live.com>

{odxtools-5.2.4.dist-info → odxtools-5.2.6.dist-info}/RECORD

@@ -57,7 +57,7 @@ odxtools/multiplexer.py,sha256=7_-wyB8WqIC1H6LVp1jnzmElRhcy-Cr7dXz9T98X0ZY,7536
 odxtools/multiplexercase.py,sha256=yCUY9s1DAvZS_YcMlZ66cLDH7p02eMWt66BBvJNRsW8,1683
 odxtools/multiplexerdefaultcase.py,sha256=j_W4dPkpAD48DKqjqBxQ_JOGwJ_iftdqGAXzqC0eZAw,1506
 odxtools/multiplexerswitchkey.py,sha256=i-rQtMsAH7mhVB0xlBwIMDsX-zbXH7F3LI8ainENoBs,1899
-odxtools/nameditemlist.py,sha256=lbhEFktkk2GsqiTJO4vaDY6lpo44n-KhWEhQ1HmSjhE,6415
+odxtools/nameditemlist.py,sha256=nEnZPYDIQ0jnriFNOI6VmJUnLR3rOfectwcyyUq2b8U,6154
 odxtools/negoutputparam.py,sha256=QJ4X4Nlo2MbBi7VbOjBvD32gTDLPpF1l6NjChzikh-k,1407
 odxtools/obd.py,sha256=5mjjnnlq2ejaJ6wESvoJevkLdYUihQXLxjf4MGFpeDg,1175
 odxtools/odxlink.py,sha256=UJdmIDwFRmg2woZsppgPYPA-g7d-h74anusw8LEHVtA,8782
@@ -68,7 +68,7 @@ odxtools/paramlengthinfotype.py,sha256=3Cxfy-vYCxAY2Q2LZOst3kFuQHBLaJbRugNSOl-y0
 odxtools/parentref.py,sha256=_ZwEKbZ1Lia9rLPW6RdMpq2mW6ZIxAkiaJdP4k4qsDA,3202
 odxtools/physicaldimension.py,sha256=3JGYuUslMWTeQ62yv9Id0M6JEc83wyc9A4CQ0FmlMM8,3360
 odxtools/physicaltype.py,sha256=iaBXWl0Z_Tu14cBP2Tmxx9zBEgsfiqQ6yKZJiiqbQVA,2673
-odxtools/progcode.py,sha256=209wfPv6onxJnzJ6yS1rKZNhDV5jwoy_u9eBZCB5YaM,2120
+odxtools/progcode.py,sha256=38mvqDYFTM4vMvrK9hizDyqe-TEm21DmCakaHproeGY,1803
 odxtools/relateddoc.py,sha256=jbBMEYycGF0TqwxNKibWyA9r6fFAWHS5lA-tN0El9QI,1335
 odxtools/request.py,sha256=hHWQgazTsvJ9WEUpGQRaRVT_QV-XjduMBxqS8zB1-3A,162
 odxtools/response.py,sha256=jowqAbTCV5YGo9R7LrYwuWmUqsOfP1lJLlph-4wrMFQ,846
@@ -89,7 +89,7 @@ odxtools/unit.py,sha256=VdiwIljfCB9zeXu8yKuAjfTwsMrpd7pXqqAqhMabyj0,3626
 odxtools/unitgroup.py,sha256=Mf7QhlFDKkUB38shWCCB8i7XLbzV8JAfnAmafUmxon0,2093
 odxtools/unitspec.py,sha256=M6QcufeitAslb_1DEmSfrMCn_s_lZN_X-NPPX31g0Y4,2959
 odxtools/utils.py,sha256=cbcNql5ahfdJfENAn_waHgGWg9XOtWblx5mMaWoKL8U,1898
-odxtools/version.py,sha256=WP4No6vw67v0PajyEK4yXpWL-1cr7_wE0fiXKAM5dBU,160
+odxtools/version.py,sha256=beFNNYXNofyL8rkkXR2tRuV17CM4Pad2qJfkxSogEnk,160
 odxtools/write_pdx_file.py,sha256=FfGkvYpzPBE-xsDrN40IyK354G5APp6WX2N3Vhl2bAw,5895
 odxtools/xdoc.py,sha256=pUYo6l60ns9LOEdutE06WMcNy25yNVl1Ni4lMpYt1pY,1467
 odxtools/cli/__init__.py,sha256=T7ano_FIyzBASxYpmcA5VJXU5bQLIy_Qk0HE_SDKelY,106
@@ -146,7 +146,7 @@ odxtools/templates/macros/printParentRef.xml.jinja2,sha256=T4bIO9jotXDyUT7COqhEs
 odxtools/templates/macros/printRequest.xml.jinja2,sha256=CyRbXJCjdevU-S4hGIiwNgE-dcZ3t-A0cdpTiIeSr6k,853
 odxtools/templates/macros/printResponse.xml.jinja2,sha256=lk3PRq8iJhcD3diGYRoelqzaQGYrqVkhvTl7vMOWmFI,804
 odxtools/templates/macros/printService.xml.jinja2,sha256=_2KsFkyhsgoGZj_AMiMQUdUEZVYl7Zz9eeth20rH7ho,2269
-odxtools/templates/macros/printSingleEcuJob.xml.jinja2,sha256=THtOrbOkXd7lk_QdbW4qYpV2u2XiOminz7nTgSbeM0o,3378
+odxtools/templates/macros/printSingleEcuJob.xml.jinja2,sha256=_6F8MguGtLIro1CYJld-0hfIxMOpSS3fi_uARLqYlfI,3372
 odxtools/templates/macros/printSpecialData.xml.jinja2,sha256=0uCbE09gMUkLb-9Xqbvo8bgFSAntcMn3tft6w8TBHqY,1373
 odxtools/templates/macros/printState.xml.jinja2,sha256=30hJuNQvy7DSJC--XhWPruB3hYiXwq6MVE1nmhqVaHA,451
 odxtools/templates/macros/printStateChart.xml.jinja2,sha256=Z6fxRiJGb5njwwP33BvsxJOsY-snqPxldsIsUq5TuTY,1114
@@ -155,9 +155,9 @@ odxtools/templates/macros/printStructure.xml.jinja2,sha256=_id63IQ9uwd7AvNltyj5x
 odxtools/templates/macros/printTable.xml.jinja2,sha256=C6DVCNMVyFjA_nRjSDMmbKvonFKTbxoUyRu0QAwj52A,1568
 odxtools/templates/macros/printUnitSpec.xml.jinja2,sha256=jEqmlJTt95BO5psIxdaQiawaL4-YtCezDXl3GUB2Z2Q,2762
 odxtools/templates/macros/printVariant.xml.jinja2,sha256=tW4lQ0zC46Ot7TBHQMYpHQAzm3F5gXXzerL3rfSPFbU,6032
-odxtools-5.2.4.dist-info/LICENSE,sha256=NeGPFQdTa6EKeON3aShVlPAIquJnbbiOfj0suz6rzyQ,1074
-odxtools-5.2.4.dist-info/METADATA,sha256=WGR_AJrs74g1iOUzoMkdFVr3Avw98D3jO0rJCiXdfvA,25486
-odxtools-5.2.4.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
-odxtools-5.2.4.dist-info/entry_points.txt,sha256=_sBDzuNoT8LbbCjfc-OJiUt5WPrtOq_x-rr9txhrPjY,53
-odxtools-5.2.4.dist-info/top_level.txt,sha256=pdS02kE5ZdgsaBRZDpX3NBFlaSx3zotsqX4E4V6tXEI,9
-odxtools-5.2.4.dist-info/RECORD,,
+odxtools-5.2.6.dist-info/LICENSE,sha256=NeGPFQdTa6EKeON3aShVlPAIquJnbbiOfj0suz6rzyQ,1074
+odxtools-5.2.6.dist-info/METADATA,sha256=YgVa6Abvl019iLJMKM74cfRSrS3hZl6fNAbz9hxbO-g,25486
+odxtools-5.2.6.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
+odxtools-5.2.6.dist-info/entry_points.txt,sha256=_sBDzuNoT8LbbCjfc-OJiUt5WPrtOq_x-rr9txhrPjY,53
+odxtools-5.2.6.dist-info/top_level.txt,sha256=pdS02kE5ZdgsaBRZDpX3NBFlaSx3zotsqX4E4V6tXEI,9
+odxtools-5.2.6.dist-info/RECORD,,