Skip to content

Match our isupper with python behavior #55

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
grdanny merged 2 commits into from
Feb 24, 2026
+626 −8
Merged

Match our isupper with python behavior #55

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
29ebebb
tightening compatbility with python's behavior in edge cases
grdanny Feb 23, 2026
b7060fd
a couple of more edge cases
grdanny Feb 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 32 additions & 8 deletions pystring_impl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -504,11 +504,18 @@ const std::string colon = ":";
if ( len == 0 ) return false;
if( len == 1 ) return ::islower( str[0] );

for ( i = 0; i < len; ++i )
{
if ( !::islower( str[i] ) ) return false;
// python's islower is a lot more leniant than c++
// this will match the python behavior so that something like
// islower("hello123") is true

bool has_cased = false;
for (i = 0; i < len; ++i) {
if (::islower(str[i]))
has_cased = true;
else if (::isupper(str[i]))
return false;
}
return true;
return has_cased;
}

//////////////////////////////////////////////////////////////////////////////////////////////
Expand Down Expand Up @@ -580,11 +587,18 @@ const std::string colon = ":";
if ( len == 0 ) return false;
if( len == 1 ) return ::isupper( str[0] );

for ( i = 0; i < len; ++i )
{
if ( !::isupper( str[i] ) ) return false;
// python's isupper is a lot more leniant than c++
// this will match the python behavior so that something like
// isupper("HELLO123") is true

bool has_cased = false;
for (std::string::size_type i = 0; i < str.size(); ++i) {
if (::isupper(str[i]))
has_cased = true;
else if (::islower(str[i]))
return false;
}
return true;
return has_cased;
}

//////////////////////////////////////////////////////////////////////////////////////////////
Expand Down Expand Up @@ -927,6 +941,16 @@ const std::string colon = ":";
int nummatches = 0;
int cursor = start;

// special handling for an empty substring
// this will match python's behavior of
// "bob".count("") == 4
// "".count("") == 1
if ( substr.empty() )
{
PYSTRING_ADJUST_INDICES(start, end, (int)str.size());
return end - start + 1;
}

while ( 1 )
{
cursor = find( str, substr, cursor, end );
Expand Down
Loading