Reverted link failed status

Author: annatisch

src/amqpvalue.pyx

@@ -121,7 +121,9 @@ cdef value_factory(c_amqpvalue.AMQP_VALUE value):
     elif type_val == AMQPType.DescribedType:
         new_obj = DescribedValue()
     else:
-        raise TypeError("Unrecognized AMQPType: {}".format(type_val))
+        error = "Unrecognized AMQPType: {}".format(type_val)
+        _logger.info(error)
+        raise TypeError(error)
     new_obj.wrap(value)
     return new_obj
 
@@ -689,7 +691,10 @@ cdef class ListValue(AMQPValue):
         value = c_amqpvalue.amqpvalue_get_list_item(self._c_value, index)
         if <void*>value == NULL:
             self._value_error()
-        return value_factory(value)
+        try:
+            return value_factory(value)
+        except TypeError:
+            return None
 
     def __setitem__(self, stdint.uint32_t index, AMQPValue value):
         assert value.type
@@ -738,7 +743,10 @@ cdef class DictValue(AMQPValue):
         value = c_amqpvalue.amqpvalue_get_map_value(self._c_value, key._c_value)
         if <void*>value == NULL:
             raise KeyError("No value found for key: {}".format(key.value))
-        return value_factory(value)
+        try:
+            return value_factory(value)
+        except TypeError:
+            return None
 
     def __setitem__(self, AMQPValue key, AMQPValue value):
         if c_amqpvalue.amqpvalue_set_map_value(self._c_value, key._c_value, value._c_value) != 0:

src/annotations.pyx

@@ -20,7 +20,10 @@ _logger = logging.getLogger(__name__)
 
 
 cdef annotations_factory(c_amqpvalue.AMQP_VALUE value):
-    wrapped = value_factory(value)
+    try:
+        wrapped = value_factory(value)
+    except TypeError:
+        return None
     if c_amqp_definitions.is_delivery_annotations_type_by_descriptor(<c_amqp_definitions.delivery_annotations>value):
         new_obj = create_delivery_annotations(wrapped)
     elif c_amqp_definitions.is_message_annotations_type_by_descriptor(<c_amqp_definitions.message_annotations>value):
@@ -115,7 +118,10 @@ cdef class cAnnotations(StructBase):
 
     @property
     def value(self):
-        return value_factory(self._c_value)
+        try:
+            return value_factory(self._c_value)
+        except TypeError:
+            return None
 
     @property
     def map(self):

src/error.pyx

@@ -87,7 +87,11 @@ cdef class cError(StructBase):
         cdef c_amqp_definitions.fields info_value
         if  c_amqp_definitions.error_get_info(self._c_value, &info_value) != 0:
             return None
-        return copy.deepcopy(value_factory(info_value).value)
+        try:
+            info = value_factory(info_value)
+            return copy.deepcopy(info.value)
+        except TypeError:
+            return None
 
     @info.setter
     def info(self, AMQPValue info_value):

uamqp/constants.py

@@ -77,7 +77,6 @@ class MessageReceiverState(Enum):
     Open = c_uamqp.MESSAGE_RECEIVER_STATE_OPEN
     Closing = c_uamqp.MESSAGE_RECEIVER_STATE_CLOSING
     Error = c_uamqp.MESSAGE_RECEIVER_STATE_ERROR
-    Failed = 99
 
 
 class MessageSendResult(Enum):
@@ -93,7 +92,6 @@ class MessageSenderState(Enum):
     Open = c_uamqp.MESSAGE_SENDER_STATE_OPEN
     Closing = c_uamqp.MESSAGE_SENDER_STATE_CLOSING
     Error = c_uamqp.MESSAGE_SENDER_STATE_ERROR
-    Failed = 99
 
 
 class ManagementLinkState(Enum):

uamqp/receiver.py

@@ -254,14 +254,9 @@ def on_state_changed(self, previous_state, new_state):
         :param new_state: The new Receiver state.
         :type new_state: ~uamqp.constants.MessageReceiverState
         """
-        if new_state == constants.MessageReceiverState.Error and \
-                previous_state == constants.MessageReceiverState.Opening:
-            _logger.debug("Message receiver received invalid ATTACH - waiting for DETACH")
-            self._state = constants.MessageReceiverState.Failed
-        elif new_state != previous_state:
-            _logger.debug("Message receiver {} state changed from {} to {}".format(
-                self.name, previous_state, new_state))
-            self._state = new_state
+        _logger.debug("Message receiver {} state changed from {} to {}".format(
+            self.name, previous_state, new_state))
+        self._state = new_state
 
     @property
     def receive_settle_mode(self):

uamqp/sender.py

@@ -222,14 +222,9 @@ def on_state_changed(self, previous_state, new_state):
         :param new_state: The new Sender state.
         :type new_state: ~uamqp.constants.MessageSenderState
         """
-        if new_state == constants.MessageSenderState.Error and \
-                previous_state == constants.MessageSenderState.Opening:
-            _logger.debug("Message sender received invalid ATTACH - waiting for DETACH")
-            self._state = constants.MessageSenderState.Failed
-        elif new_state != previous_state:
-            _logger.debug("Message sender {} state changed from {} to {}".format(
-                self.name, previous_state, new_state))
-            self._state = new_state
+        _logger.debug("Message sender {} state changed from {} to {}".format(
+            self.name, previous_state, new_state))
+        self._state = new_state
 
     @property
     def send_settle_mode(self):