edid: Shorten two code snippets.

diff --git a/decoders/edid/pd.py b/decoders/edid/pd.py
index 91db4b871d5b23dfbe744793f339c99c63204697..034c314f4d28941e205f64a74110415da046dafa 100644 (file)
--- a/decoders/edid/pd.py
+++ b/decoders/edid/pd.py
@@ -267,10 +267,7 @@ class Decoder(srd.Decoder):
 
     def ann_field(self, start, end, annotation):
         annotation = annotation if isinstance(annotation, list) else [annotation]
 
     def ann_field(self, start, end, annotation):
         annotation = annotation if isinstance(annotation, list) else [annotation]

-        if self.extension:
-            sn = self.ext_sn[self.extension - 1]
-        else:
-            sn = self.sn
+        sn = self.ext_sn[self.extension - 1] if self.extension else self.sn

         self.put(sn[start][0], sn[end][1],
                  self.out_ann, [ANN_FIELDS, annotation])
 
         self.put(sn[start][0], sn[end][1],
                  self.out_ann, [ANN_FIELDS, annotation])
 


@@ -525,10 +522,7 @@ class Decoder(srd.Decoder):
         self.ann_field(offset+3, offset+3, "Tag: {0:X}".format(tag))
         self.ann_field(offset+4, offset+4, "Flag")
 
         self.ann_field(offset+3, offset+3, "Tag: {0:X}".format(tag))
         self.ann_field(offset+4, offset+4, "Flag")
 

-        if self.extension:
-            sn = self.ext_sn[extension - 1]
-        else:
-            sn = self.sn
+        sn = self.ext_sn[self.extension - 1] if self.extension else self.sn

 
         if tag == 0xff:
             # Monitor serial number
 
         if tag == 0xff:
             # Monitor serial number