Skip to content

Commit 9be0f54

Browse files
committed
Python 3.7 (Debian 10) has no dictionary merge operator, use alternative syntax.
1 parent 0a1dd11 commit 9be0f54

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

src/hal/drivers/mesa-hostmot2/mesambccc.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -778,7 +778,7 @@ def handleInits(inits):
778778
if len(set(cmd.attrib).intersection(RATEATTRIB)) > 0:
779779
# Set override communication parameters
780780
checkAttribs(cmd.attrib, RATEATTRIB, lil)
781-
cfgs = verifyConfigParams(CONFIGDEFAULT | cmd.attrib) # Setup new config set
781+
cfgs = verifyConfigParams({**CONFIGDEFAULT, **cmd.attrib}) # Setup new config set
782782
if None == cfgs:
783783
perr("Invalid communication parameters in {}".format(lil))
784784
continue
@@ -1460,7 +1460,7 @@ def main():
14601460

14611461
# Merge and check the comms attributes
14621462
global configparams
1463-
configparams = verifyConfigParams(configparams | root.attrib)
1463+
configparams = verifyConfigParams({**configparams, **root.attrib})
14641464
if None == configparams:
14651465
return 1
14661466

0 commit comments

Comments
 (0)