Merge pull request #322 from andlaus/more_small_fixes

More small fixes

Author: andlaus

odxtools/cli/browse.py

@@ -112,7 +112,8 @@ def prompt_single_parameter_value(parameter: Parameter) -> Optional[AtomicOdxTyp
 
 def encode_message_interactively(sub_service: Union[Request, Response],
                                  ask_user_confirmation: bool = False) -> None:
-    if not sys.__stdin__.isatty() or not sys.__stdout__.isatty():
+    if sys.__stdin__ is None or sys.__stdout__ is None or not sys.__stdin__.isatty(
+    ) or not sys.__stdout__.isatty():
         raise SystemError("This command can only be used in an interactive shell!")
     param_dict = sub_service.parameter_dict()
 
@@ -260,7 +261,8 @@ def encode_message_from_string_values(
 
 
 def browse(odxdb: Database) -> None:
-    if not sys.__stdin__.isatty() or not sys.__stdout__.isatty():
+    if sys.__stdin__ is None or sys.__stdout__ is None or not sys.__stdin__.isatty(
+    ) or not sys.__stdout__.isatty():
         raise SystemError("This command can only be used in an interactive shell!")
     dl_names = [dl.short_name for dl in odxdb.diag_layers]
     while True:

odxtools/comparaminstance.py

@@ -32,7 +32,7 @@ def from_et(et_element: ElementTree.Element,
         spec_ref = odxrequire(OdxLinkRef.from_et(et_element, doc_frags))
 
         # ODX standard v2.0.0 defined only VALUE. ODX v2.0.1 decided
-        # to break things and change it to choice between SIMPLE-VALUE
+        # to break things and change it to a choice between SIMPLE-VALUE
         # and COMPLEX-VALUE
         value: Union[str, List[Union[str, ComplexValue]]]
         if et_element.find("VALUE") is not None:

odxtools/odxlink.py

@@ -4,29 +4,14 @@
 from typing import Any, Dict, Iterable, List, Optional, Type, TypeVar, overload
 from xml.etree import ElementTree
 
-from .exceptions import OdxWarning, odxassert, odxraise
+from .exceptions import OdxWarning, odxassert, odxraise, odxrequire
 from .nameditemlist import OdxNamed, TNamed
 
 
 @dataclass(frozen=True)
 class OdxDocFragment:
     doc_name: str
-    doc_type: Optional[str]
-
-    def __eq__(self, other: Any) -> bool:
-        if other is None:
-            # if the other document fragment is not specified, we
-            # treat it as a wildcard...
-            return True
-
-        if not isinstance(other, OdxDocFragment):
-            return False
-
-        # the ODX spec says that the doctype can be ignored...
-        return self.doc_name == other.doc_name
-
-    def __hash__(self) -> int:
-        return hash(self.doc_name) + hash(self.doc_type)
+    doc_type: str
 
 
 @dataclass(frozen=True)
@@ -121,6 +106,7 @@ def from_et(et: Optional[ElementTree.Element],
 
         id_ref = et.attrib.get("ID-REF")
         if id_ref is None:
+            odxraise(f"Tag {et.tag} is not a ODXLINK reference")
             return None
 
         doc_ref = et.attrib.get("DOCREF")
@@ -134,7 +120,7 @@ def from_et(et: Optional[ElementTree.Element],
         # reference, use it, else use the document fragment containing
         # the reference.
         if doc_ref is not None:
-            doc_frags = [OdxDocFragment(doc_ref, doc_type)]
+            doc_frags = [OdxDocFragment(doc_ref, odxrequire(doc_type))]
         else:
             doc_frags = source_doc_frags
 
@@ -154,9 +140,9 @@ def __str__(self) -> str:
 
 class OdxLinkDatabase:
     """
-    A database holding all objects which ehibit OdxLinkIds
+    A database holding all objects which exhibit OdxLinkIds
 
-    This can resolve references to such.
+    This can resolve ODXLINK references.
     """
 
     def __init__(self) -> None:
@@ -182,7 +168,7 @@ def resolve(self, ref: OdxLinkRef, expected_type: Optional[Any] = None) -> Any:
             if doc_frag_db is None:
                 # No object featured by the database uses the document
                 # fragment mentioned by the reference. This should not
-                # happen for correct databases...
+                # happen for correct ODX databases...
                 warnings.warn(
                     f"Warning: Unknown document fragment {ref_frag} "
                     f"when resolving reference {ref}",

odxtools/templates/macros/printComparam.xml.jinja2

@@ -44,7 +44,9 @@
          {{make_xml_attrib("DISPLAY-LEVEL", cp.display_level)}}{#- #}
           CPUSAGE="{{cp.cpusage.value}}">
   {{ peid.printElementIdSubtags(cp)|indent(1) }}
-  <PHYSICAL-DEFAULT-VALUE>{{cp.physical_default_value}}</PHYSICAL-DEFAULT-VALUE>
+  {%- if cp.physical_default_value is not none %}
+  <PHYSICAL-DEFAULT-VALUE>{{cp.physical_default_value | e}}</PHYSICAL-DEFAULT-VALUE>
+  {%- endif %}
  <DATA-OBJECT-PROP-REF ID-REF="{{cp.dop_ref.ref_id}}" />
 </COMPARAM>
 {%- endmacro %}
@@ -61,7 +63,7 @@
  {%- for sub_cp in cp.subparams %}
  {{- printAnyComparam(sub_cp) | indent(1, first=True) }}
  {%- endfor %}
- {%- if  cp.physical_default_value is not none %}
+ {%- if cp.physical_default_value is not none %}
  {{ printComplexValue(cp.physical_default_value, "COMPLEX-PHYSICAL-DEFAULT-VALUE") | indent(1) }}
  {%- endif %}
 </COMPLEX-COMPARAM>

odxtools/templates/macros/printCompuMethod.xml.jinja2

@@ -18,14 +18,7 @@
 {%- if limit_obj.value_raw is none %}
   {#- #}/>
 {%- else %}
-  {#- #}>
-  {%- if hasattr(limit_obj._value, 'hex') -%}
-  {#- bytes or bytarray limit #}
-  {{- limit_obj._value.hex().upper() }}
-  {%- else -%}
-  {{- limit_obj._value }}
-  {%- endif -%}
-</{{tag_name}}>
+  {#- #}>{{- limit_obj.value_raw }}</{{tag_name}}>
 {%- endif -%}
 {%- endif -%}
 {%- endmacro -%}

odxtools/templates/macros/printEcuVariantPattern.xml.jinja2

@@ -9,7 +9,7 @@
 
 {%- macro printMatchingParameter(mp) -%}
 <MATCHING-PARAMETER>
-  <EXPECTED-VALUE>{{mp.expected_value}}</EXPECTED-VALUE>
+  <EXPECTED-VALUE>{{mp.expected_value | e}}</EXPECTED-VALUE>
   <DIAG-COMM-SNREF SHORT-NAME="{{mp.diag_comm_snref}}" />
   {#- TODO: OUT-PARAM-IF-SNPATHREF #}
   <OUT-PARAM-IF-SNREF SHORT-NAME="{{mp.out_param_if}}" />

odxtools/templates/macros/printParam.xml.jinja2

@@ -35,28 +35,27 @@
 {%- endif %}
 {%- if param.coded_value is defined %}
  <CODED-VALUE>{{param.coded_value}}</CODED-VALUE>
-{%- elif param.physical_constant_value_raw is defined %}
- <PHYS-CONSTANT-VALUE>{{param.physical_constant_value_raw}}</PHYS-CONSTANT-VALUE>
 {%- elif param.coded_values is defined %}
  <CODED-VALUES>
  {%- for coded_value in param.coded_values %}
   <CODED-VALUE>{{coded_value}}</CODED-VALUE>
  {%- endfor %}
  </CODED-VALUES>
 {%- endif %}
-{%- if param.physical_default_value_raw %}
- <PHYSICAL-DEFAULT-VALUE>{{param.physical_default_value_raw}}</PHYSICAL-DEFAULT-VALUE>
+{%- if param.physical_constant_value_raw is defined %}
+ <PHYS-CONSTANT-VALUE>{{param.physical_constant_value_raw}}</PHYS-CONSTANT-VALUE>
+{%- endif %}
+{%- if param.physical_default_value_raw is defined and param.physical_default_value_raw is not none %}
+ <PHYSICAL-DEFAULT-VALUE>{{param.physical_default_value_raw | e}}</PHYSICAL-DEFAULT-VALUE>
 {%- endif %}
 {%- if param.dop_ref %}
  <DOP-REF ID-REF="{{param.dop_ref.ref_id}}"/>
 {%- elif param.dop_snref %}
  <DOP-SNREF SN="{{param.dop_snref}}"/>
 {%- elif param.diag_coded_type is defined %}
  {{pdop.printDiagCodedType(param.diag_coded_type)|indent(2)}}
-{%- elif param.parameter_type != "MATCHING-REQUEST-PARAM" %}
- {%- if param.bit_length is defined and param.bit_length is not none %}
-  <BIT-LENGTH>{{param.bit_length}}</BIT-LENGTH>
- {%- endif %}
+{%- elif param.bit_length is defined and param.bit_length is not none %}
+ <BIT-LENGTH>{{param.bit_length}}</BIT-LENGTH>
 {%- endif %}
 {%- if param.parameter_type == "TABLE-KEY" %}
  {%- if param.table_ref %}

odxtools/templates/macros/printService.xml.jinja2

@@ -4,6 +4,7 @@
 -#}
 
 {%- import('macros/printDiagComm.xml.jinja2') as pdc %}
+{%- import('macros/printComparamRef.xml.jinja2') as pcom %}
 
 {%- macro printService(service) -%}
 <DIAG-SERVICE {{pdc.printDiagCommAttribs(service) | indent(1) }}
@@ -18,8 +19,8 @@
   {{pdc.printDiagCommSubtags(service) | indent(1, first=True) }}
   {%- if service.comparam_refs %}
   <COMPARAM-REFS>
-    {%- for ref in service.comparam_refs %}
-    <COMPARAM-REF ID-REF="{{ref.ref_id}}" />
+    {%- for cpref in service.comparam_refs %}
+    {{ pcom.printComparamRef(cpref)|indent(4) }}
     {%- endfor %}
   </COMPARAM-REFS>
   {%- endif%}

odxtools/templates/macros/printSingleEcuJob.xml.jinja2

@@ -65,8 +65,8 @@
 <INPUT-PARAM {{-make_xml_attrib("OID", param.oid)}}
              {{-make_xml_attrib("SEMANTIC", param.semantic)}}>
  {{ peid.printElementIdSubtags(param)|indent(1) }}
-{%- if param.physical_default_value %}
- <PHYSICAL-DEFAULT-VALUE>{{param.physical_default_value}}</PHYSICAL-DEFAULT-VALUE>
+{%- if param.physical_default_value is not none %}
+ <PHYSICAL-DEFAULT-VALUE>{{param.physical_default_value | e}}</PHYSICAL-DEFAULT-VALUE>
 {%- endif %}
  <DOP-BASE-REF ID-REF="{{param.dop_base_ref.ref_id}}" />
 </INPUT-PARAM>