@@ -433,7 +433,7 @@ def modify_cpu(self, mod):
433
433
def modify_peripheral (self , pspec , pmod ):
434
434
"""Modify pspec inside device according to pmod."""
435
435
for ptag in self .iter_peripherals (pspec ):
436
- for ( key , value ) in pmod .items ():
436
+ for key , value in pmod .items ():
437
437
if key == "name" :
438
438
# If this peripheral has derivations, update the derived
439
439
# peripherals to reference the new name.
@@ -452,7 +452,7 @@ def modify_peripheral(self, pspec, pmod):
452
452
453
453
if key == "addressBlock" :
454
454
ab = ptag .find (key )
455
- for ( ab_key , ab_value ) in value .items ():
455
+ for ab_key , ab_value in value .items ():
456
456
if ab .find (ab_key ) is not None :
457
457
ab .remove (ab .find (ab_key ))
458
458
ET .SubElement (ab , ab_key ).text = str (ab_value )
@@ -461,7 +461,7 @@ def modify_peripheral(self, pspec, pmod):
461
461
ptag .remove (ab )
462
462
for ab in value :
463
463
ab_el = ET .SubElement (ptag , "addressBlock" )
464
- for ( ab_key , ab_value ) in ab .items ():
464
+ for ab_key , ab_value in ab .items ():
465
465
ET .SubElement (ab_el , ab_key ).text = str (ab_value )
466
466
else :
467
467
tag = ptag .find (key )
@@ -481,7 +481,7 @@ def add_peripheral(self, pname, padd):
481
481
else :
482
482
pnew = ET .SubElement (parent , "peripheral" )
483
483
ET .SubElement (pnew , "name" ).text = pname
484
- for ( key , value ) in padd .items ():
484
+ for key , value in padd .items ():
485
485
if key == "registers" :
486
486
ET .SubElement (pnew , "registers" )
487
487
for rname in value :
@@ -491,12 +491,12 @@ def add_peripheral(self, pname, padd):
491
491
Peripheral (pnew ).add_interrupt (iname , value [iname ])
492
492
elif key == "addressBlock" :
493
493
ab = ET .SubElement (pnew , "addressBlock" )
494
- for ( ab_key , ab_value ) in value .items ():
494
+ for ab_key , ab_value in value .items ():
495
495
ET .SubElement (ab , ab_key ).text = str (ab_value )
496
496
elif key == "addressBlocks" :
497
497
for ab in value :
498
498
ab_el = ET .SubElement (ptag , "addressBlock" )
499
- for ( ab_key , ab_value ) in ab .items ():
499
+ for ab_key , ab_value in ab .items ():
500
500
ET .SubElement (ab_el , ab_key ).text = str (ab_value )
501
501
elif key != "derivedFrom" :
502
502
ET .SubElement (pnew , key ).text = str (value )
@@ -792,7 +792,7 @@ def add_interrupt(self, iname, iadd):
792
792
def modify_interrupt (self , ispec , imod ):
793
793
"""Modify ispec according to imod"""
794
794
for itag in self .iter_interrupts (ispec ):
795
- for ( key , value ) in imod .items ():
795
+ for key , value in imod .items ():
796
796
tag = itag .find (key )
797
797
if value == "" :
798
798
itag .remove (tag )
@@ -807,7 +807,7 @@ def delete_interrupt(self, ispec):
807
807
def modify_register (self , rspec , rmod ):
808
808
"""Modify rspec inside ptag according to rmod."""
809
809
for rtag in self .iter_registers (rspec ):
810
- for ( key , value ) in rmod .items ():
810
+ for key , value in rmod .items ():
811
811
tag = rtag .find (key )
812
812
if value == "" and tag is not None :
813
813
rtag .remove (tag )
@@ -830,7 +830,7 @@ def add_register(self, rname, radd):
830
830
)
831
831
rnew = ET .SubElement (parent , "register" )
832
832
ET .SubElement (rnew , "name" ).text = rname
833
- for ( key , value ) in radd .items ():
833
+ for key , value in radd .items ():
834
834
if key == "fields" :
835
835
ET .SubElement (rnew , "fields" )
836
836
for fname in value :
@@ -907,7 +907,7 @@ def copy_register(self, rname, rderive):
907
907
rcopy .find ("name" ).text = rname
908
908
if rcopy .find ("displayName" ) is not None :
909
909
rcopy .remove (rcopy .find ("displayName" ))
910
- for ( key , value ) in rderive .items ():
910
+ for key , value in rderive .items ():
911
911
if key == "_from" :
912
912
continue
913
913
elif key == "fields" :
@@ -926,7 +926,7 @@ def delete_register(self, rspec):
926
926
def modify_cluster (self , cspec , cmod ):
927
927
"""Modify cspec inside ptag according to cmod."""
928
928
for ctag in self .iter_clusters (cspec ):
929
- for ( key , value ) in cmod .items ():
929
+ for key , value in cmod .items ():
930
930
tag = ctag .find (key )
931
931
if value == "" :
932
932
ctag .remove (tag )
@@ -1019,7 +1019,7 @@ def collect_in_cluster(self, cname, cmod):
1019
1019
rspecs = [r for r in cmod if r != "description" ]
1020
1020
for rspec in rspecs :
1021
1021
registers = []
1022
- for ( rtag , match_rspec ) in list (self .iter_registers_with_matches (rspec )):
1022
+ for rtag , match_rspec in list (self .iter_registers_with_matches (rspec )):
1023
1023
rname = rtag .findtext ("name" )
1024
1024
li , ri = spec_ind (match_rspec )
1025
1025
registers .append (
@@ -1217,7 +1217,7 @@ def strip(self, substr, strip_end=False):
1217
1217
def modify_field (self , fspec , fmod ):
1218
1218
"""Modify fspec inside rtag according to fmod."""
1219
1219
for ftag in self .iter_fields (fspec ):
1220
- for ( key , value ) in fmod .items ():
1220
+ for key , value in fmod .items ():
1221
1221
if key == "_write_constraint" :
1222
1222
key = "writeConstraint"
1223
1223
@@ -1262,7 +1262,7 @@ def add_field(self, fname, fadd):
1262
1262
)
1263
1263
fnew = ET .SubElement (parent , "field" )
1264
1264
ET .SubElement (fnew , "name" ).text = fname
1265
- for ( key , value ) in fadd .items ():
1265
+ for key , value in fadd .items ():
1266
1266
ET .SubElement (fnew , key ).text = str (value )
1267
1267
fnew .tail = "\n "
1268
1268
0 commit comments