Skip to content

PySide6 Handle QRegExp case sensitivity, FixedString, and Wildcard pattern syntaxes #1075

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

Open
jonahjnewton wants to merge 2 commits into
base: master
Choose a base branch
from
Open

PySide6 Handle QRegExp case sensitivity, FixedString, and Wildcard pattern syntaxes #1075

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d2a8fcf
Handle case sensitivity, FixedString, and Wildcard pattern syntaxes i…
jonahjnewton Dec 2, 2025
41f5f9c
Remove whitespace
jonahjnewton Dec 2, 2025
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
33 changes: 26 additions & 7 deletions python/tank/util/pyside6_patcher.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,6 +324,8 @@ def child(self, row, column):
def _patch_QRegularExpression(cls, QtCore):
"""Patch QRegularExpression."""

from enum import Enum

original_QRegularExpression = QtCore.QRegularExpression

class QRegularExpression(original_QRegularExpression):
Expand All @@ -333,23 +335,31 @@ def __init__(self, *args, **kwargs):
else:
nargs = len(args)

search_pattern = args[0]

case_sensitivity = kwargs.get("cs")
if not case_sensitivity and nargs > 1:
case_sensitivity = args[1]

# FIXME can we port pattern syntax?
# FIXME can we port pattern syntaxes other than FixedString/Wildcard?
pattern_syntax = kwargs.get("syntax")
if not pattern_syntax and nargs > 2:
pattern_syntax = args[2]

if pattern_syntax:
if pattern_syntax == QRegularExpression.FixedString:
search_pattern = original_QRegularExpression.escape(search_pattern)
elif pattern_syntax == QRegularExpression.Wildcard:
search_pattern = original_QRegularExpression.wildcardToRegularExpression(search_pattern, original_QRegularExpression.WildcardConversionOption.NonPathWildcardConversion)

if case_sensitivity is None:
original_QRegularExpression.__init__(self, args[0])
original_QRegularExpression.__init__(self, search_pattern)
else:
if case_sensitivity == original_QRegularExpression.CaseInsensitiveOption:
if case_sensitivity in [original_QRegularExpression.CaseInsensitiveOption, QtCore.Qt.CaseInsensitive]:
opts = original_QRegularExpression.CaseInsensitiveOption
else:
opts = original_QRegularExpression.NoPatternOption
original_QRegularExpression.__init__(self, args[0], options=opts)
original_QRegularExpression.__init__(self, search_pattern, options=opts)

self.isEmpty = lambda *args, **kwargs: QRegularExpression.isEmpty(self, *args, **kwargs)
self.indexIn = lambda *args, **kwargs: QRegularExpression.indexIn(self, *args, **kwargs)
Expand Down Expand Up @@ -380,7 +390,7 @@ def setCaseSensitivity(re, value):
"""Patch QRegExp setCaseSensitivity method."""

options = re.patternOptions()
if value == original_QRegularExpression.CaseInsensitiveOption:
if value in [original_QRegularExpression.CaseInsensitiveOption, QtCore.Qt.CaseInsensitive]:
options |= original_QRegularExpression.CaseInsensitiveOption
else:
options &= ~original_QRegularExpression.CaseInsensitiveOption
Expand Down Expand Up @@ -416,14 +426,23 @@ def cap(re, n):
"""
return ""

class PatternSyntax(Enum):
# RegExp = 0
# RegExp2 = 1
Wildcard = 2
# WildcardUnix = 3
FixedString = 4
# W3CXmlSchema11 = 5

QtCore.QRegularExpression.isEmpty = QRegularExpression.isEmpty
QtCore.QRegularExpression.indexIn = QRegularExpression.indexIn
QtCore.QRegularExpression.matchedLength = QRegularExpression.matchedLength
QtCore.QRegularExpression.setCaseSensitivity = QRegularExpression.setCaseSensitivity
QtCore.QRegularExpression.pos = QRegularExpression.pos

# This pattern matching flag is obsolete now.
QtCore.QRegularExpression.FixedString = None
# These pattern matching flags are obsolete now, but we port to the expected QRegExp equivalent in the patched __init__.
QtCore.QRegularExpression.Wildcard = QRegularExpression.PatternSyntax.Wildcard
QtCore.QRegularExpression.FixedString = QRegularExpression.PatternSyntax.FixedString

# Class must be set last
QtCore.QRegularExpression = QRegularExpression
Expand Down