This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6396

rust-python3: compatibility fix for integer conversion
ClosedPublic

Authored by gracinet on May 17 2019, 7:42 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG163b8fd7bb72: rust-python3: compatibility fix for integer conversion
rHGf887a8c1abde: rust-python3: compatibility fix for integer conversion
Summary

On python3, to_py_object() on the usize gives us a PyLong,
whereas it is the generic PyObject already on python2, which fits
the py.None() default value.

Upcasting to PyObject explicitely in all cases solves the issue.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Revision Contents
Changeset List

PathPackages
Mrust/hg-cpython/src/discovery.rs (8 lines)

Diff 15163

rust/hg-cpython/src/discovery.rs

//! //!
//! # Classes visible from Python: //! # Classes visible from Python:
//! - [`PartialDiscover`] is the Rust implementation of //! - [`PartialDiscover`] is the Rust implementation of
//! `mercurial.setdiscovery.partialdiscovery`. //! `mercurial.setdiscovery.partialdiscovery`.
use crate::conversion::{py_set, rev_pyiter_collect}; use crate::conversion::{py_set, rev_pyiter_collect};
use cindex::Index; use cindex::Index;
use cpython::{ use cpython::{
ObjectProtocol, PyDict, PyModule, PyObject, PyResult, Python, ToPyObject, ObjectProtocol, PyDict, PyModule, PyObject, PyResult, Python,
PythonObject, ToPyObject,
}; };
use exceptions::GraphError; use exceptions::GraphError;
use hg::discovery::PartialDiscovery as CorePartialDiscovery; use hg::discovery::PartialDiscovery as CorePartialDiscovery;
use hg::Revision; use hg::Revision;
use std::cell::RefCell; use std::cell::RefCell;
py_class!(pub class PartialDiscovery |py| { py_class!(pub class PartialDiscovery |py| {
def iscomplete(&self) -> PyResult<bool> { def iscomplete(&self) -> PyResult<bool> {
Ok(self.inner(py).borrow().is_complete()) Ok(self.inner(py).borrow().is_complete())
} }
def stats(&self) -> PyResult<PyDict> { def stats(&self) -> PyResult<PyDict> {
let stats = self.inner(py).borrow().stats(); let stats = self.inner(py).borrow().stats();
let as_dict: PyDict = PyDict::new(py); let as_dict: PyDict = PyDict::new(py);
as_dict.set_item(py, "undecided", as_dict.set_item(py, "undecided",
stats.undecided.map(|l| l.to_py_object(py)) stats.undecided.map(
|l| l.to_py_object(py).into_object())
.unwrap_or_else(|| py.None()))?; .unwrap_or_else(|| py.None()))?;
Ok(as_dict) Ok(as_dict)
} }
def commonheads(&self) -> PyResult<PyObject> { def commonheads(&self) -> PyResult<PyObject> {
py_set( py_set(
py, py,
&self.inner(py).borrow().common_heads() &self.inner(py).borrow().common_heads()
.map_err(|e| GraphError::pynew(py, e))? .map_err(|e| GraphError::pynew(py, e))?