eds: Fix exception in comment parsing with hexadecimal line count. (#279)

acolomb · web-flow · commit 99bb97b9dd37 · 2021-11-10T15:42:34.000Z
Inside an EDS file's [Comments] section, the Lines attribute may be
expressed as a hexadecimal number prefixed with 0x.  The
ConfigParser.getint() method however does not support such a format.

Switch to the default int() constructor with a base=0 argument to
enable auto-detection of this condition.  The same is done for
basically every other numeric value in the EDS importer.
diff --git a/canopen/objectdictionary/eds.py b/canopen/objectdictionary/eds.py
@@ -41,7 +41,7 @@ def import_eds(source, node_id):
         }
 
     if eds.has_section("Comments"):
-        linecount = eds.getint("Comments", "Lines")
+        linecount = int(eds.get("Comments", "Lines"), 0)
         od.comments = '\n'.join([
             eds.get("Comments", "Line%i" % line)
             for line in range(1, linecount+1)

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ def import_eds(source, node_id):`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`if eds.has_section("Comments"):`
`44`		`- linecount = eds.getint("Comments", "Lines")`
	`44`	`+ linecount = int(eds.get("Comments", "Lines"), 0)`
`45`	`45`	`od.comments = '\n'.join([`
`46`	`46`	`eds.get("Comments", "Line%i" % line)`
`47`	`47`	`for line in range(1, linecount+1)`