From 396cab2895f6809f329fdd83079439d1da9a0a81 Mon Sep 17 00:00:00 2001 From: Alex Soderman <5639572+asoderman@users.noreply.github.com> Date: Wed, 21 Feb 2018 16:24:55 -0500 Subject: [PATCH 1/3] Implemented Error trait for PyErr --- src/.err.rs.swp | Bin 0 -> 28672 bytes src/err.rs | 17 +++++++++++++++++ 2 files changed, 17 insertions(+) create mode 100644 src/.err.rs.swp diff --git a/src/.err.rs.swp b/src/.err.rs.swp new file mode 100644 index 0000000000000000000000000000000000000000..2ff387d7605ddfaef8eb7a97c3852dd4119eff2c GIT binary patch literal 28672 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 literal 0 HcmV?d00001 diff --git a/src/err.rs b/src/err.rs index 6c168e95..eda6be0b 100644 --- a/src/err.rs +++ b/src/err.rs @@ -28,6 +28,8 @@ use std::ptr; use libc::c_char; use conversion::ToPyObject; use std::ffi::CString; +use std::error::Error; +use std::fmt; /** Defines a new exception type. @@ -394,6 +396,21 @@ impl <'p> std::convert::From> for PyErr { } } +impl Error for PyErr { + + fn description(&self) -> &str { + "Error originating from the rust-cpython bindings." + } + +} + +impl fmt::Display for PyErr { + + fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { + write!(f, "PyErr: ptype {:?} pvalue {:?}", self.ptype, self.pvalue) + } +} + /// Construct PyObject from the result of a Python FFI call that returns a new reference (owned pointer). /// Returns `Err(PyErr)` if the pointer is `null`. /// Unsafe because the pointer might be invalid. From 0aa4286b009545310aaf58eb21abe7e88a5e6620 Mon Sep 17 00:00:00 2001 From: Alex Soderman <5639572+asoderman@users.noreply.github.com> Date: Wed, 21 Feb 2018 16:28:55 -0500 Subject: [PATCH 2/3] removed swap file --- src/.err.rs.swp | Bin 28672 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 src/.err.rs.swp diff --git a/src/.err.rs.swp b/src/.err.rs.swp deleted file mode 100644 index 2ff387d7605ddfaef8eb7a97c3852dd4119eff2c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 28672 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 From 9e7fb66382c1e78d3af575c4561e200dd52f7da4 Mon Sep 17 00:00:00 2001 From: Alex Soderman <5639572+asoderman@users.noreply.github.com> Date: Wed, 21 Feb 2018 16:35:07 -0500 Subject: [PATCH 3/3] fixed whitespace --- src/err.rs | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/err.rs b/src/err.rs index eda6be0b..b31e945a 100644 --- a/src/err.rs +++ b/src/err.rs @@ -397,15 +397,12 @@ impl <'p> std::convert::From> for PyErr { } impl Error for PyErr { - fn description(&self) -> &str { "Error originating from the rust-cpython bindings." } - } impl fmt::Display for PyErr { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { write!(f, "PyErr: ptype {:?} pvalue {:?}", self.ptype, self.pvalue) }