massive update on SegmentationDescriptor.from_xml()

threefive/descriptors.py

@@ -560,18 +560,20 @@ def from_xml(self, stuff):
         """
         Load a SegmentationDescriptor from XML
         """
-        self.load(stuff["SegmentationDescriptor"])
+        ssd = stuff["SegmentationDescriptor"]
+        self.load(ssd)
         self.segmentation_event_id_compliance_indicator = True
         self.program_segmentation_flag = True
         self.segmentation_duration_flag = False
-        if "segmentationDuration" in stuff["SegmentationDescriptor"]:
+        if "segmentationDuration" in ssd:
             self.segmentation_duration_flag = True
         self.delivery_not_restricted_flag = True
         if "DeliveryRestrictions" in stuff:
+            sdr = stuff["DeliveryRestrictions"]
             self.delivery_not_restricted_flag = False
-            self.load(stuff["DeliveryRestrictions"])
-            self.device_restrictions = table20[self.device_restrictions]
-        self.segmentation_event_id = hex(self.segmentation_event_id)
+            self.load(sdr)
+            self.device_restrictions = table20[sdr["device_restrictions"]]
+        self.segmentation_event_id = hex(ssd["segmentation_event_id"])
         if self.segmentation_type_id in table22:
             self.segmentation_message = table22[self.segmentation_type_id]
         self._upid_from_xml(stuff)