Fix underscores for isupper

coolreader18 · coolreader18 · commit 368fe7294d9b · 2019-10-27T22:52:01.000-05:00
diff --git a/tests/snippets/strings.py b/tests/snippets/strings.py
@@ -324,3 +324,6 @@ def try_mutate_str():
 assert not "a".__ne__("a")
 assert not "".__ne__("")
 assert "".__ne__(1) == NotImplemented
+
+assert "A_B".isupper()
+assert "a_b".islower()
diff --git a/vm/src/obj/objstr.rs b/vm/src/obj/objstr.rs
@@ -727,11 +727,12 @@ impl PyString {
 
     #[pymethod]
     fn isupper(&self, _vm: &VirtualMachine) -> bool {
+        // TODO: assert not " ".isupper(), assert not "_".isupper()
         !self.value.is_empty()
             && self
                 .value
                 .chars()
-                .filter(|x| !x.is_ascii_whitespace())
+                .filter(|x| !x.is_ascii_whitespace() && *x != '_')
                 .all(char::is_uppercase)
     }
 
@@ -741,7 +742,7 @@ impl PyString {
             && self
                 .value
                 .chars()
-                .filter(|x| !x.is_ascii_whitespace())
+                .filter(|x| !x.is_ascii_whitespace() && *x != '_')
                 .all(char::is_lowercase)
     }
 
