Merge branch 'develop'

takeshixx · Sep 4, 2016 · 75008a7 · 75008a7
2 parents dcc5f49 + a7d1aae
commit 75008a7
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/libknxmap/bus/tunnel.py b/libknxmap/bus/tunnel.py
@@ -347,11 +347,11 @@ def apci_device_descriptor_read(self, target):
             sequence=self.tpci_seq_counts.get(target))
         value = yield from self.send_data(tunnel_request.get_message(), target)
         yield from self.tpci_send_ncd(target)
-        cemi = value.body.get('cemi')
-        if isinstance(value, KnxTunnellingRequest) and \
-                cemi.get('apci').get('type') == CEMI_APCI_TYPES.get('A_DeviceDescriptor_Response') and \
-                cemi.get('data'):
-            return value.body.get('cemi').get('data')
+        if isinstance(value, KnxTunnellingRequest):
+            cemi = value.body.get('cemi')
+            if cemi.get('apci').get('type') == CEMI_APCI_TYPES.get('A_DeviceDescriptor_Response') and \
+                    cemi.get('data'):
+                return value.body.get('cemi').get('data')
         else:
             return False