mschoi/RustPython
1
0
Fork 0
forked from Rust-related/RustPython
Code Pull Requests Actions Activity

#1575 distinguish between 'cased' and 'non-cased' characters

Browse Source
This commit is contained in:
J Regex
2019-10-29 15:27:38 +09:00
parent 0b50c21eff
commit 71c7c61bf6
1 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
vm/src/obj/objstr.rs
View File

@@ -728,24 +728,35 @@ impl PyString {
#[pymethod]
fn isupper(&self, _vm: &VirtualMachine) -> bool {
// TODO: assert not " ".isupper(), assert not "_".isupper()
!self.value.is_empty()
if self.value.chars().all(char::is_numeric) {
false
}
else{
!self.value.is_empty()
&& self
.value
.chars()
.filter(|x| !x.is_ascii_whitespace() && *x != '_')
.filter(|x| !x.is_ascii_whitespace())
.filter(|x| !x.is_numeric())
.all(char::is_uppercase)
}
}
#[pymethod]
fn islower(&self, _vm: &VirtualMachine) -> bool {
!self.value.is_empty()
if self.value.chars().all(char::is_numeric) {
false
}
else{
!self.value.is_empty()
&& self
.value
.chars()
.filter(|x| !x.is_ascii_whitespace() && *x != '_')
.filter(|x| !x.is_ascii_whitespace())
.filter(|x| !x.is_numeric())
.all(char::is_lowercase)
}
}
#[pymethod]
fn isascii(&self, _vm: &VirtualMachine) -> bool {
!self.value.is_empty() && self.value.chars().all(|c| c.is_ascii())