Raise exception from Rust.

Author: thedrow

amqp/serialization.py

@@ -7,8 +7,8 @@
 from __future__ import absolute_import, unicode_literals
 
 import calendar
-import sys
 import os
+import sys
 from datetime import datetime
 from decimal import Decimal
 from io import BytesIO
@@ -22,17 +22,11 @@
 
 ftype_t = chr if sys.version_info[0] == 3 else None
 
-ILLEGAL_TABLE_TYPE = """\
-    Table type {0!r} not handled by amqp.
-"""
+ILLEGAL_TABLE_TYPE = "Table type {0!r} not handled by amqp."
 
-ILLEGAL_TABLE_TYPE_WITH_KEY = """\
-Table type {0!r} for key {1!r} not handled by amqp. [value: {2!r}]
-"""
+ILLEGAL_TABLE_TYPE_WITH_KEY = "Table type {0!r} for key {1!r} not handled by amqp. [value: {2!r}]"
 
-ILLEGAL_TABLE_TYPE_WITH_VALUE = """\
-    Table type {0!r} not handled by amqp. [value: {1!r}]
-"""
+ILLEGAL_TABLE_TYPE_WITH_VALUE = "Table type {0!r} not handled by amqp. [value: {1!r}]"
 
 
 def _read_item(buf, offset=0, unpack_from=unpack_from, ftype_t=ftype_t):

src/lib.rs

@@ -9,6 +9,7 @@ use pyo3::types::*;
 use pyo3::wrap_pyfunction;
 use pyo3::{IntoPy, Py};
 use std::io::{self, Cursor, Read, Seek, SeekFrom};
+use pyo3::import_exception;
 
 // Since this module is being currently imported we assume the GIL is acquired.
 // If it isn't, this module is the least of our problems
@@ -31,6 +32,8 @@ lazy_static! {
     };
 }
 
+import_exception!(amqp, FrameSyntaxError);
+
 struct AMQPDeserializer<'deserializer_l> {
     py: &'deserializer_l Python<'deserializer_l>,
     format: &'deserializer_l str,
@@ -156,7 +159,7 @@ impl<'deserializer_l> AMQPDeserializer<'deserializer_l> {
     }
 
     #[inline]
-    fn read_item(&mut self) -> io::Result<PyObject> {
+    fn read_item(&mut self) -> PyResult<PyObject> {
         let ftype = self.cursor.read_u8()? as char;
         match ftype {
             'S' => {
@@ -187,7 +190,7 @@ impl<'deserializer_l> AMQPDeserializer<'deserializer_l> {
             't' => Ok((self.cursor.read_u8()? == 1).to_object(*self.py)),
             'T' => Ok(self.read_timestamp()?.into()),
             'V' => Ok(self.py.None()),
-            _ => Ok(self.py.None()), // TODO: Return error
+            _ => Err(FrameSyntaxError::py_err(format!("Unknown value in table: '{}'", ftype)).into()),
         }
     }
 
@@ -214,7 +217,7 @@ impl<'deserializer_l> AMQPDeserializer<'deserializer_l> {
         Ok(array)
     }
 
-    fn deserialize(&mut self) -> io::Result<(&'deserializer_l PyList, u64)> {
+    fn deserialize(&mut self) -> PyResult<(&'deserializer_l PyList, u64)> {
         let values = PyList::empty(*self.py);
 
         for p in self.format.chars() {
@@ -266,7 +269,7 @@ impl<'deserializer_l> AMQPDeserializer<'deserializer_l> {
                     values.append(self.read_array()?)?;
                 }
                 _ => {
-                    // TODO: Handle errors correctly
+                    return Err(FrameSyntaxError::py_err(format!("Table type '{}' not handled by amqp.", p)).into());
                 }
             }
         }

t/unit/test_serialization.py

@@ -9,7 +9,8 @@
 from amqp.basic_message import Message
 from amqp.exceptions import FrameSyntaxError
 from amqp.platform import pack
-from amqp.serialization import GenericContent, _read_item, dumps, loads
+from amqp.serialization import (ILLEGAL_TABLE_TYPE, GenericContent, _read_item,
+                                dumps, loads)
 
 
 class _ANY(object):
@@ -69,7 +70,10 @@ def test_int_boundaries(self):
         }]
 
     def test_loads_unknown_type(self):
-        with pytest.raises(FrameSyntaxError):
+        with pytest.raises(
+            FrameSyntaxError,
+            match=ILLEGAL_TABLE_TYPE.format('y')
+        ):
             loads('y', 'asdsad')
 
     def test_float(self):