Patchwork D7454: py3: send bytes from Rust-created warning patterns

login
register
mail settings
Submitter phabricator
Date Nov. 19, 2019, 3:49 a.m.
Message ID <7dd696d186ef8f10c4e119a685fb4d3a@localhost.localdomain>
Download mbox | patch
Permalink /patch/43340/
State Not Applicable
Headers show

Comments

phabricator - Nov. 19, 2019, 3:49 a.m.
Closed by commit rHGdc4e74d0ef96: py3: send bytes from Rust-created warning patterns (authored by Alphare).
This revision was automatically updated to reflect the committed changes.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D7454?vs=18210&id=18220

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D7454/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D7454

AFFECTED FILES
  rust/hg-cpython/src/filepatterns.rs

CHANGE DETAILS




To: Alphare, #hg-reviewers, indygreg
Cc: durin42, kevincox, mercurial-devel

Patch

diff --git a/rust/hg-cpython/src/filepatterns.rs b/rust/hg-cpython/src/filepatterns.rs
--- a/rust/hg-cpython/src/filepatterns.rs
+++ b/rust/hg-cpython/src/filepatterns.rs
@@ -13,8 +13,7 @@ 
 //!
 use crate::exceptions::{PatternError, PatternFileError};
 use cpython::{
-    PyBytes, PyDict, PyModule, PyObject, PyResult, PyString, PyTuple, Python,
-    ToPyObject,
+    PyBytes, PyDict, PyModule, PyObject, PyResult, PyTuple, Python, ToPyObject,
 };
 use hg::{
     build_single_regex, read_pattern_file, utils::files::get_path_from_bytes,
@@ -66,12 +65,12 @@ 
 fn warnings_to_py_bytes(
     py: Python,
     warnings: &[(PathBuf, Vec<u8>)],
-) -> Vec<(PyString, PyBytes)> {
+) -> Vec<(PyBytes, PyBytes)> {
     warnings
         .iter()
         .map(|(path, syn)| {
             (
-                PyString::new(py, &path.to_string_lossy()),
+                PyBytes::new(py, &path.to_string_lossy().as_bytes()),
                 PyBytes::new(py, syn),
             )
         })