matching our isupper behavior to pythons

Author: grdanny

pystring_impl.h

@@ -574,17 +574,19 @@ const std::string colon = ":";
     //////////////////////////////////////////////////////////////////////////////////////////////
     ///
     ///
-    bool isupper( const std::string & str )
+    bool isupper(const std::string &str)
     {
-        std::string::size_type len = str.size(), i;
-        if ( len == 0 ) return false;
-        if( len == 1 ) return ::isupper( str[0] );
-
-        for ( i = 0; i < len; ++i )
+        // this is written this way to match python's behavior of isupper
+        // in python something like "HELLO!" returns true (the "!" is basically ignored)
+        bool has_cased = false;
+        for (std::string::size_type i = 0; i < str.size(); ++i)
         {
-           if ( !::isupper( str[i] ) ) return false;
+            if (::isupper(str[i]))
+                has_cased = true;
+            else if (::islower(str[i]))
+                return false;
         }
-        return true;
+        return has_cased;
     }
 
     //////////////////////////////////////////////////////////////////////////////////////////////

test.cpp

@@ -33,6 +33,17 @@ PYSTRING_ADD_TEST(pystring, endswith)
     PYSTRING_CHECK_EQUAL(pystring::endswith("abcdef", "cdef", -10), true);
 }
 
+PYSTRING_ADD_TEST(pystring, isupper)
+{
+    PYSTRING_CHECK_EQUAL(pystring::isupper("ABC"), true);
+    PYSTRING_CHECK_EQUAL(pystring::isupper("abc"), false);
+    PYSTRING_CHECK_EQUAL(pystring::isupper("ABc"), false);
+    PYSTRING_CHECK_EQUAL(pystring::isupper("AB-C"), true);
+    PYSTRING_CHECK_EQUAL(pystring::isupper("HELLO 123"), true);
+    PYSTRING_CHECK_EQUAL(pystring::isupper("123"), false);
+    PYSTRING_CHECK_EQUAL(pystring::isupper("HELLO!"), true);
+}
+
 PYSTRING_ADD_TEST(pystring, find)
 {
     PYSTRING_CHECK_EQUAL(pystring::find("", ""), 0);