This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6397

rust-python3: compatibility fix for incoming PyLong
ClosedPublic

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

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG48df8a06c8bb: rust-python3: compatibility fix for incoming PyLong
Summary

On Python3, PyInt is PyLong and it doesn't have the
value() method.
Re upcasting to PythonObj as done here works, but we
might prefer taking a PythonObj from the onset
(would require more testing)

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

gracinet created this revision.May 17 2019, 7:42 AM
yuja added a subscriber: yuja.May 17 2019, 11:25 PM

@@ -153,7 +153,7 @@

&dirstate_vec?,
&copies?,
DirstateParents { p1, p2 },
  • now.value(py) as i32,

+ now.into_object().extract::<i32>(py)?,

Minor thing, but I think as_object() is preferred since it isn't needed
to consume the now value to extract.

gracinet updated this revision to Diff 15207.May 21 2019, 1:58 PM
gracinet added a comment.May 21 2019, 2:01 PM

@yuja yes indeed, just resubmitted with as_object(), thanks

Actually the first variant I tried was with it but I must have botched it, because it didn't compile.

gracinet added a comment.May 21 2019, 2:09 PM

D6415 is also necessary to actually build with python3

Closed by commit rHG48df8a06c8bb: rust-python3: compatibility fix for incoming PyLong (authored by gracinet). · Explain WhyMay 21 2019, 7:31 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mrust/hg-cpython/src/dirstate.rs (4 lines)

Diff 15212

rust/hg-cpython/src/dirstate.rs

// dirstate.rs // dirstate.rs
// //
// Copyright 2019 Raphaël Gomès <rgomes@octobus.net> // Copyright 2019 Raphaël Gomès <rgomes@octobus.net>
// //
// This software may be used and distributed according to the terms of the // This software may be used and distributed according to the terms of the
// GNU General Public License version 2 or any later version. // GNU General Public License version 2 or any later version.
//! Bindings for the `hg::dirstate` module provided by the //! Bindings for the `hg::dirstate` module provided by the
//! `hg-core` package. //! `hg-core` package.
//! //!
//! From Python, this will be seen as `mercurial.rustext.dirstate` //! From Python, this will be seen as `mercurial.rustext.dirstate`
use cpython::{ use cpython::{
exc, PyBytes, PyDict, PyErr, PyInt, PyModule, PyObject, PyResult, exc, PyBytes, PyDict, PyErr, PyInt, PyModule, PyObject, PyResult,
PySequence, PyTuple, Python, ToPyObject, PySequence, PythonObject, PyTuple, Python, ToPyObject,
}; };
use hg::{ use hg::{
pack_dirstate, parse_dirstate, CopyVecEntry, DirstateEntry, pack_dirstate, parse_dirstate, CopyVecEntry, DirstateEntry,
DirstatePackError, DirstateParents, DirstateParseError, DirstateVec, DirstatePackError, DirstateParents, DirstateParseError, DirstateVec,
}; };
use std::collections::HashMap; use std::collections::HashMap;
use std::ffi::CStr; use std::ffi::CStr;
#[cfg(feature = "python27")] #[cfg(feature = "python27")]
)) ))
}) })
.collect(); .collect();
match pack_dirstate( match pack_dirstate(
&dirstate_vec?, &dirstate_vec?,
&copies?, &copies?,
DirstateParents { p1, p2 }, DirstateParents { p1, p2 },
now.value(py) as i32, now.as_object().extract::<i32>(py)?,
) { ) {
Ok((packed, new_dirstate_vec)) => { Ok((packed, new_dirstate_vec)) => {
for ( for (
filename, filename,
DirstateEntry { DirstateEntry {
state, state,
mode, mode,
size, size,