| hg-reviewers |
Python code expects bytes in both Python 2 and Python 3, so we should send
bytes.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| // filepatterns.rs | // filepatterns.rs | ||||
| // | // | ||||
| // Copyright 2019, Georges Racinet <gracinet@anybox.fr>, | // Copyright 2019, Georges Racinet <gracinet@anybox.fr>, | ||||
| // Raphaël Gomès <rgomes@octobus.net> | // 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::filepatterns` module provided by the | //! Bindings for the `hg::filepatterns` module provided by the | ||||
| //! `hg-core` crate. From Python, this will be seen as `rustext.filepatterns` | //! `hg-core` crate. From Python, this will be seen as `rustext.filepatterns` | ||||
| //! and can be used as replacement for the the pure `filepatterns` Python | //! and can be used as replacement for the the pure `filepatterns` Python | ||||
| //! module. | //! module. | ||||
| //! | //! | ||||
| use crate::exceptions::{PatternError, PatternFileError}; | use crate::exceptions::{PatternError, PatternFileError}; | ||||
| use cpython::{ | use cpython::{ | ||||
| PyBytes, PyDict, PyModule, PyObject, PyResult, PyString, PyTuple, Python, | PyBytes, PyDict, PyModule, PyObject, PyResult, PyTuple, Python, ToPyObject, | ||||
| ToPyObject, | |||||
| }; | }; | ||||
| use hg::{ | use hg::{ | ||||
| build_single_regex, read_pattern_file, utils::files::get_path_from_bytes, | build_single_regex, read_pattern_file, utils::files::get_path_from_bytes, | ||||
| LineNumber, PatternTuple, | LineNumber, PatternTuple, | ||||
| }; | }; | ||||
| use std::path::PathBuf; | use std::path::PathBuf; | ||||
| /// Rust does not like functions with different return signatures. | /// Rust does not like functions with different return signatures. | ||||
| } | } | ||||
| Err(e) => Err(PatternFileError::pynew(py, e)), | Err(e) => Err(PatternFileError::pynew(py, e)), | ||||
| } | } | ||||
| } | } | ||||
| fn warnings_to_py_bytes( | fn warnings_to_py_bytes( | ||||
| py: Python, | py: Python, | ||||
| warnings: &[(PathBuf, Vec<u8>)], | warnings: &[(PathBuf, Vec<u8>)], | ||||
| ) -> Vec<(PyString, PyBytes)> { | ) -> Vec<(PyBytes, PyBytes)> { | ||||
| warnings | warnings | ||||
| .iter() | .iter() | ||||
| .map(|(path, syn)| { | .map(|(path, syn)| { | ||||
| ( | ( | ||||
| PyString::new(py, &path.to_string_lossy()), | PyBytes::new(py, &path.to_string_lossy().as_bytes()), | ||||
| PyBytes::new(py, syn), | PyBytes::new(py, syn), | ||||
| ) | ) | ||||
| }) | }) | ||||
| .collect() | .collect() | ||||
| } | } | ||||
| fn build_single_regex_wrapper( | fn build_single_regex_wrapper( | ||||
| py: Python, | py: Python, | ||||