Merge branch 'master' into maci-run-clippy-on-all-the-codebase

Author: konstin

.travis.yml

@@ -21,7 +21,7 @@ matrix:
     - name: Minimum nightly
       python: "3.7"
       # Keep this synced up with build.rs
-      env: TRAVIS_RUST_VERSION=nightly-2019-06-21
+      env: TRAVIS_RUST_VERSION=nightly-2019-07-19
       # Tested via anaconda PyPy (since travis's PyPy version is too old)
     - name: PyPy3.5 7.0
       python: "3.7"

CHANGELOG.md

@@ -14,6 +14,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
  * Use existing fields and methods before calling custom __getattr__. [#505](https://github.com/PyO3/pyo3/pull/512)
  * `PyBytes` can now be indexed just like `Vec<u8>`
 
+## Removed 
+
+ * `#[pyclass(subclass)]` is hidden a `unsound-subclass` feature because it's causing segmentation faults.
+
 ### Fixed
 
  * More readable error message for generics in pyclass [#503](https://github.com/PyO3/pyo3/pull/503)
@@ -22,6 +26,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
  * Implementing the Using the `gc` parameter for `pyclass` (e.g. `#[pyclass(gc)]`) without implementing the `class::PyGCProtocol` trait is now a compile-time error. Failing to implement this trait could lead to segfaults. [#532](https://github.com/PyO3/pyo3/pull/532)
  * `PyByteArray::data` has been replaced with `PyDataArray::to_vec` because returning a `&[u8]` is unsound. (See [this comment](https://github.com/PyO3/pyo3/issues/373#issuecomment-512332696) for a great write-up for why that was unsound)
+ * Replace `mashup` with `paste`.
 
 ## [0.7.0] - 2018-05-26
 

Cargo.toml

@@ -23,11 +23,11 @@ libc = "0.2.54"
 spin = "0.5.0"
 num-traits = "0.2.6"
 pyo3cls = { path = "pyo3cls", version = "=0.7.0" }
-mashup = "0.1.9"
 num-complex = { version = "0.2.1", optional = true }
 inventory = "0.1.3"
 indoc = "0.3.3"
 unindent = "0.1.3"
+paste = "0.1.5"
 
 [dev-dependencies]
 assert_approx_eq = "1.1.0"
@@ -55,6 +55,9 @@ extension-module = []
 # are welcome.
 # abi3 = []
 
+# Activate subclassing support
+unsound-subclass = ["pyo3cls/unsound-subclass"]
+
 [workspace]
 members = [
     "pyo3cls",

README.md

@@ -16,7 +16,7 @@ A comparison with rust-cpython can be found [in the guide](https://pyo3.rs/maste
 
 ## Usage
 
-PyO3 supports Python 3.5 and up. The minimum required Rust version is 1.34.0-nightly 2019-02-06.
+PyO3 supports Python 3.5 and up. The minimum required Rust version is 1.37.0-nightly 2019-07-19.
 
 PyPy is also supported (via cpyext) for Python 3.5 only, targeted PyPy version is 7.0.0.
 Please refer to the guide for installation instruction against PyPy.
@@ -129,6 +129,7 @@ fn main() -> PyResult<()> {
    * Contains an example of building wheels on Azure Pipelines
  * [fastuuid](https://github.com/thedrow/fastuuid/) _Python bindings to Rust's UUID library_
  * [python-ext-wasm](https://github.com/wasmerio/python-ext-wasm) _Python library to run WebAssembly binaries_
+ * [dict-derive](https://github.com/gperinazzo/dict-derive) _Derive FromPyObject to automatically transform Python dicts into Rust structs_
 
 ## License
 

build.rs

@@ -16,7 +16,7 @@ use version_check::{Channel, Date, Version};
 /// Specifies the minimum nightly version needed to compile pyo3.
 /// Keep this synced up with the travis ci config,
 /// But note that this is the rustc version which can be lower than the nightly version
-const MIN_DATE: &'static str = "2019-06-21";
+const MIN_DATE: &'static str = "2019-07-18";
 const MIN_VERSION: &'static str = "1.37.0-nightly";
 
 /// Information returned from python interpreter

ci/travis/setup.sh

@@ -51,4 +51,4 @@ if [ ! -f "$HOME/.cargo/bin/kcov" ]; then
     make
     install src/kcov $HOME/.cargo/bin/kcov
     cd $TRAVIS_BUILD_DIR
-fi
+fi

codecov.yml

@@ -0,0 +1,2 @@
+comment: off
+

examples/rustapi_module/Cargo.toml

@@ -9,7 +9,7 @@ edition = "2018"
 
 [dependencies.pyo3]
 path = "../../"
-features = ["extension-module"]
+features = ["extension-module", "unsound-subclass"]
 
 [lib]
 name = "rustapi_module"

guide/src/class.md

@@ -102,10 +102,10 @@ so that they can benefit from a freelist. `XXX` is a number of items for the fre
 If a custom class contains references to other Python objects that can be collected, the `PyGCProtocol` trait has to be implemented.
 * `weakref` - Adds support for Python weak references.
 * `extends=BaseType` - Use a custom base class. The base `BaseType` must implement `PyTypeInfo`.
-* `subclass` - Allows Python classes to inherit from this class.
 * `dict` - Adds `__dict__` support, so that the instances of this type have a dictionary containing arbitrary instance variables.
 * `module="XXX"` - Set the name of the module the class will be shown as defined in. If not given, the class
   will be a virtual member of the `builtins` module.
+* `subclass` - Allows Python classes to inherit from this class. This feature is hidden behind a `unsound-subclass` feature because it is currently causing segmentation faults
 
 ## Constructor
 

guide/src/exception.md

@@ -128,23 +128,39 @@ more complex arguments are required, the
 trait can be implemented. In that case, actual exception argument creation is delayed
 until a `Python` object is available.
 
-```rust,ignore
-use std::net::TcpListener;
-use pyo3::{PyErr, PyResult, exc};
+```rust
+# use pyo3::{exceptions, PyErr, PyResult};
+# use std::error::Error;
+# use std::fmt;
+#
+# #[derive(Debug)]
+# struct CustomIOError;
+#
+# impl Error for CustomIOError {}
+#
+# impl fmt::Display for CustomIOError {
+#     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+#         write!(f, "Oh no!")
+#     }
+# }
+#
+# fn bind(_addr: &str) -> Result<(), CustomIOError> {
+#     Err(CustomIOError)
+# }
 
-impl std::convert::From<std::io::Error> for PyErr {
-    fn from(err: std::io::Error) -> PyErr {
-        exceptions::OSError.into()
+impl std::convert::From<CustomIOError> for PyErr {
+    fn from(err: CustomIOError) -> PyErr {
+        exceptions::OSError::py_err(err.to_string())
     }
 }
 
 fn connect(s: String) -> PyResult<bool> {
-    TcpListener::bind("127.0.0.1:80")?;
+    bind("127.0.0.1:80")?;
     Ok(true)
 }
 ```
 
-The code snippet above will raise an `OSError` in Python if `TcpListener::bind()` returns an error.
+The code snippet above will raise an `OSError` in Python if `bind()` returns a `CustomIOError`.
 
 The `std::convert::From<T>` trait is implemented for most of the Rust standard library's error
 types so the `try!` macro or the `?` operator can be used.

guide/src/function.md

@@ -53,9 +53,7 @@ In order to make the function signature available to Python to be retrieved via
 formatted like in the example below. Please note that the newline after the
 `--` is mandatory. The `/` signifies the end of positional-only arguments. This
 is not a feature of this library in particular, but the general format used by
-CPython for annotating signatures of built-in functions. Function signatures for
-built-ins are new in Python 3 — in Python 2, they are simply considered to be a
-part of the docstring.
+CPython for annotating signatures of built-in functions.
 
 ```rust
 use pyo3::prelude::*;

guide/src/get_started.md

@@ -10,7 +10,7 @@ A comparison with rust-cpython can be found [in the guide](https://pyo3.rs/maste
 
 ## Usage
 
-PyO3 supports Python 3.5 and up. The minimum required Rust version is 1.34.0-nightly 2019-02-06.
+PyO3 supports Python 3.5 and up. The minimum required Rust version is 1.37.0-nightly 2019-07-19.
 
 PyPy is also supported (via cpyext) for Python 3.5 only, targeted PyPy version is 7.0.0.
 Please refer to the guide for installation instruction against PyPy.

pyo3-derive-backend/Cargo.toml

@@ -14,3 +14,6 @@ edition = "2018"
 quote = "0.6.12"
 proc-macro2 = "0.4.30"
 syn = { version = "0.15.34", features = ["full", "extra-traits"] }
+
+[features]
+unsound-subclass = []

pyo3-derive-backend/src/pyclass.rs

@@ -132,6 +132,12 @@ impl PyClassArgs {
                 parse_quote! {pyo3::type_object::PY_TYPE_FLAG_WEAKREF}
             }
             "subclass" => {
+                if cfg!(not(feature = "unsound-subclass")) {
+                    return Err(syn::Error::new_spanned(
+                        exp.path.clone(),
+                        "You need to activate the `unsound-subclass` feature if you want to use subclassing",
+                    ));
+                }
                 parse_quote! {pyo3::type_object::PY_TYPE_FLAG_BASETYPE}
             }
             "dict" => {

pyo3cls/Cargo.toml

@@ -18,3 +18,6 @@ quote= "0.6.12"
 proc-macro2 = "0.4.30"
 syn = { version = "0.15.34", features = ["full", "extra-traits"] }
 pyo3-derive-backend = { path = "../pyo3-derive-backend", version = "=0.7.0" }
+
+[features]
+unsound-subclass = ["pyo3-derive-backend/unsound-subclass"]

src/class/number.rs

@@ -1271,111 +1271,125 @@ where
     }
 }
 
-trait PyNumberRAddProtocolImpl {
+#[doc(hidden)]
+pub trait PyNumberRAddProtocolImpl {
     fn __radd__() -> Option<PyMethodDef> {
         None
     }
 }
 
 impl<'p, T> PyNumberRAddProtocolImpl for T where T: PyNumberProtocol<'p> {}
 
-trait PyNumberRSubProtocolImpl {
+#[doc(hidden)]
+pub trait PyNumberRSubProtocolImpl {
     fn __rsub__() -> Option<PyMethodDef> {
         None
     }
 }
 
 impl<'p, T> PyNumberRSubProtocolImpl for T where T: PyNumberProtocol<'p> {}
 
-trait PyNumberRMulProtocolImpl {
+#[doc(hidden)]
+pub trait PyNumberRMulProtocolImpl {
     fn __rmul__() -> Option<PyMethodDef> {
         None
     }
 }
 
 impl<'p, T> PyNumberRMulProtocolImpl for T where T: PyNumberProtocol<'p> {}
 
-trait PyNumberRMatmulProtocolImpl {
+#[doc(hidden)]
+pub trait PyNumberRMatmulProtocolImpl {
     fn __rmatmul__() -> Option<PyMethodDef> {
         None
     }
 }
 
 impl<'p, T> PyNumberRMatmulProtocolImpl for T where T: PyNumberProtocol<'p> {}
 
-trait PyNumberRTruedivProtocolImpl {
+#[doc(hidden)]
+pub trait PyNumberRTruedivProtocolImpl {
     fn __rtruediv__() -> Option<PyMethodDef> {
         None
     }
 }
 
 impl<'p, T> PyNumberRTruedivProtocolImpl for T where T: PyNumberProtocol<'p> {}
 
-trait PyNumberRFloordivProtocolImpl {
+#[doc(hidden)]
+pub trait PyNumberRFloordivProtocolImpl {
     fn __rfloordiv__() -> Option<PyMethodDef> {
         None
     }
 }
 
 impl<'p, T> PyNumberRFloordivProtocolImpl for T where T: PyNumberProtocol<'p> {}
 
-trait PyNumberRModProtocolImpl {
+#[doc(hidden)]
+pub trait PyNumberRModProtocolImpl {
     fn __rmod__() -> Option<PyMethodDef> {
         None
     }
 }
 
 impl<'p, T> PyNumberRModProtocolImpl for T where T: PyNumberProtocol<'p> {}
 
-trait PyNumberRDivmodProtocolImpl {
+#[doc(hidden)]
+pub trait PyNumberRDivmodProtocolImpl {
     fn __rdivmod__() -> Option<PyMethodDef> {
         None
     }
 }
 
 impl<'p, T> PyNumberRDivmodProtocolImpl for T where T: PyNumberProtocol<'p> {}
 
-trait PyNumberRPowProtocolImpl {
+#[doc(hidden)]
+pub trait PyNumberRPowProtocolImpl {
     fn __rpow__() -> Option<PyMethodDef> {
         None
     }
 }
 
 impl<'p, T> PyNumberRPowProtocolImpl for T where T: PyNumberProtocol<'p> {}
 
-trait PyNumberRLShiftProtocolImpl {
+#[doc(hidden)]
+pub trait PyNumberRLShiftProtocolImpl {
     fn __rlshift__() -> Option<PyMethodDef> {
         None
     }
 }
 
 impl<'p, T> PyNumberRLShiftProtocolImpl for T where T: PyNumberProtocol<'p> {}
 
-trait PyNumberRRShiftProtocolImpl {
+#[doc(hidden)]
+pub trait PyNumberRRShiftProtocolImpl {
     fn __rrshift__() -> Option<PyMethodDef> {
         None
     }
 }
 
 impl<'p, T> PyNumberRRShiftProtocolImpl for T where T: PyNumberProtocol<'p> {}
 
-trait PyNumberRAndProtocolImpl {
+#[doc(hidden)]
+pub trait PyNumberRAndProtocolImpl {
     fn __rand__() -> Option<PyMethodDef> {
         None
     }
 }
 
 impl<'p, T> PyNumberRAndProtocolImpl for T where T: PyNumberProtocol<'p> {}
 
-trait PyNumberRXorProtocolImpl {
+#[doc(hidden)]
+pub trait PyNumberRXorProtocolImpl {
     fn __rxor__() -> Option<PyMethodDef> {
         None
     }
 }
 
 impl<'p, T> PyNumberRXorProtocolImpl for T where T: PyNumberProtocol<'p> {}
 
-trait PyNumberROrProtocolImpl {
+#[doc(hidden)]
+pub trait PyNumberROrProtocolImpl {
     fn __ror__() -> Option<PyMethodDef> {
         None
     }

src/err.rs

@@ -11,7 +11,6 @@ use crate::IntoPyPointer;
 use crate::Python;
 use crate::{IntoPyObject, ToBorrowedObject, ToPyObject};
 use libc::c_int;
-use std::error::Error;
 use std::ffi::CString;
 use std::io;
 use std::os::raw::c_char;
@@ -412,7 +411,7 @@ macro_rules! impl_to_pyerr {
     ($err: ty, $pyexc: ty) => {
         impl PyErrArguments for $err {
             fn arguments(&self, py: Python) -> PyObject {
-                self.description().to_object(py)
+                self.to_string().to_object(py)
             }
         }
 
@@ -459,10 +458,9 @@ impl std::convert::From<io::Error> for PyErr {
     }
 }
 
-/// Extract `errno` and `errdesc` from from `io::Error`
 impl PyErrArguments for io::Error {
     fn arguments(&self, py: Python) -> PyObject {
-        (self.raw_os_error().unwrap_or(0), self.description()).to_object(py)
+        self.to_string().to_object(py)
     }
 }
 
@@ -474,7 +472,7 @@ impl<W: 'static + Send + std::fmt::Debug> std::convert::From<std::io::IntoInnerE
 
 impl<W: Send + std::fmt::Debug> PyErrArguments for std::io::IntoInnerError<W> {
     fn arguments(&self, py: Python) -> PyObject {
-        self.description().to_object(py)
+        self.to_string().to_object(py)
     }
 }