Skip to content

chore: enhance re_findall function to handle None and empty string patterns #4164

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
liuruibin merged 1 commit into from
Oct 10, 2025
Merged

chore: enhance re_findall function to handle None and empty string patterns #4164

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 6 additions & 1 deletion apps/common/utils/split_model.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,12 @@ def parse_level(text, pattern: str):


def re_findall(pattern, text):
if not pattern or not pattern.strip():
# 检查 pattern 是否为空或无效
if pattern is None:
return []

# 如果是字符串类型，检查是否为空字符串
if isinstance(pattern, str) and (not pattern or not pattern.strip()):
return []

try:
Copy link
Contributor Author

@shaohuzhang1 shaohuzhang1 Oct 10, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The code has a few minor issues that require adjustments:

  1. The function name re_findall does not match the expected behavior compared to Python's built-in re.findall. This could cause confusion for users.

  2. There is no explicit documentation or comments explaining why certain parts of the function are included or what they do.

  3. The use of None as a condition makes sense for empty patterns but should be commented to clarify its purpose.

  4. The check for an empty string and whitespace-only strings at the beginning of the pattern might be unnecessary and should be removed since it would behave correctly with standard regular expressions.

Here is the revised version with these improvements:

def re_finds_all(pattern, text):
    """
    Find all non-overlapping matches of the pattern in the string using re module.
    
    :param pattern: Regex pattern as a string or compiled regex object
    :param text: String to search within
    :return: List of all matched substrings
    """
    
    if pattern is None:
        return []
    
    try:
        import re
        return re.findall(pattern, text)
    except TypeError as e:
        print(f"Error while finding pattern: {e}")
        return []

# Example usage:
# result = re_finds_all(r'\b\w+\b', "Hello World")
# print(result)  # Output: ['Hello', 'World']

Key Changes:

  • Function Name: Renamed to re_finds_all to clearly indicate its intended functionality.
  • Comments: Added docstring to describe the function and its parameters.
  • Error Handling: Included a basic error handling mechanism for catching type errors when attempting to find the pattern in the text.
  • Removed Unnecessary Check: Removed the additional check for empty or whitespace-only strings.

Expand Down
Loading