Skip to content

Use non-deprecated pyparsing methods #3362

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
edmondchuc merged 11 commits into from
Feb 13, 2026
Merged

Use non-deprecated pyparsing methods #3362

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
384fca6
Use non-deprecated pyparsing methods
rafguns Jan 7, 2026
8770316
Format with black
rafguns Jan 7, 2026
45eedcf
fix: mypy error and add ValueError on unexpected term type
edmondchuc Feb 13, 2026
70fe2f7
fix: empty solution is still valid in tsv results parser
edmondchuc Feb 13, 2026
da8864c
chore: formatting
edmondchuc Feb 13, 2026
90c3c99
Merge branch '7.x' into issue3361
edmondchuc Feb 13, 2026
59f585c
fix: add pyparsing v2 and v3 compat layer
edmondchuc Feb 13, 2026
aed6dd5
Merge branch 'issue3361' of https://github.com/rafguns/rdflib into is…
edmondchuc Feb 13, 2026
15de377
Merge branch '7.x' into issue3361
edmondchuc Feb 13, 2026
b7589fa
fix: make pyparsing compat aliases class-override-safe for v2/v3
edmondchuc Feb 13, 2026
03fa6bd
Merge branch 'issue3361' of https://github.com/rafguns/rdflib into is…
edmondchuc Feb 13, 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
111 changes: 57 additions & 54 deletions rdflib/plugins/sparql/parser.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,13 @@
Regex,
Suppress,
ZeroOrMore,
delimitedList,
restOfLine,
)

import rdflib
from rdflib.compat import decodeUnicodeEscape

from . import operators as op
from .pyparsing_compat import DelimitedList, combine_join_kwargs, rest_of_line
from .parserutils import Comp, CompValue, Param, ParamList

# from pyparsing import Keyword as CaseSensitiveKeyword
Expand Down Expand Up @@ -89,7 +88,7 @@ def expandTriples(terms: ParseResults) -> List[Any]:
last_subject, last_predicate = t[0], None
res.append(t[0])
elif isinstance(t, ParseResults):
res += t.asList()
res += t.as_list()
elif t != ".":
res.append(t)
if (len(res) % 3) == 1:
Expand Down Expand Up @@ -126,8 +125,8 @@ def expandBNodeTriples(terms: ParseResults) -> List[Any]:
if DEBUG:
print("Bnode terms", terms)
print("1", terms[0])
print("2", [rdflib.BNode()] + terms.asList()[0])
return [expandTriples([rdflib.BNode()] + terms.asList()[0])]
print("2", [rdflib.BNode()] + terms.as_list()[0])
return [expandTriples([rdflib.BNode()] + terms.as_list()[0])]
except Exception as e:
if DEBUG:
print(">>>>>>>>", e)
Expand Down Expand Up @@ -170,7 +169,7 @@ def expandCollection(terms: ParseResults) -> List[List[Any]]:
+ Regex(r'[^<>"{}|^`\\%s]*' % "".join("\\x%02X" % i for i in range(33)))
+ Suppress(">")
)
IRIREF.setParseAction(lambda x: rdflib.URIRef(x[0]))
IRIREF.set_parse_action(lambda x: rdflib.URIRef(x[0]))

# [164] P_CHARS_BASE ::= [A-Z] | [a-z] | [#x00C0-#x00D6] | [#x00D8-#x00F6] | [#x00F8-#x02FF] | [#x0370-#x037D] | [#x037F-#x1FFF] | [#x200C-#x200D] | [#x2070-#x218F] | [#x2C00-#x2FEF] | [#x3001-#xD7FF] | [#xF900-#xFDCF] | [#xFDF0-#xFFFD] | [#x10000-#xEFFFF]

Expand Down Expand Up @@ -209,21 +208,21 @@ def expandCollection(terms: ParseResults) -> List[List[Any]]:
)

# [140] PNAME_NS ::= PN_PREFIX? ':'
PNAME_NS = Optional(Param("prefix", PN_PREFIX)) + Suppress(":").leaveWhitespace()
PNAME_NS = Optional(Param("prefix", PN_PREFIX)) + Suppress(":").leave_whitespace()

# [173] PN_LOCAL_ESC ::= '\' ( '_' | '~' | '.' | '-' | '!' | '$' | '&' | "'" | '(' | ')' | '*' | '+' | ',' | ';' | '=' | '/' | '?' | '#' | '@' | '%' )

PN_LOCAL_ESC_re = "\\\\[_~\\.\\-!$&\"'()*+,;=/?#@%]"
# PN_LOCAL_ESC = Regex(PN_LOCAL_ESC_re) # regex'd
# PN_LOCAL_ESC.setParseAction(lambda x: x[0][1:])
# PN_LOCAL_ESC.set_parse_action(lambda x: x[0][1:])

# [172] HEX ::= [0-9] | [A-F] | [a-f]
# HEX = Regex('[0-9A-Fa-f]') # not needed

# [171] PERCENT ::= '%' HEX HEX
PERCENT_re = "%[0-9a-fA-F]{2}"
# PERCENT = Regex(PERCENT_re) # regex'd
# PERCENT.setParseAction(lambda x: chr(int(x[0][1:], 16)))
# PERCENT.set_parse_action(lambda x: chr(int(x[0][1:], 16)))

# [170] PLX ::= PERCENT | PN_LOCAL_ESC
PLX_re = "(%s|%s)" % (PN_LOCAL_ESC_re, PERCENT_re)
Expand All @@ -242,14 +241,14 @@ def expandCollection(terms: ParseResults) -> List[List[Any]]:


# [141] PNAME_LN ::= PNAME_NS PN_LOCAL
PNAME_LN = PNAME_NS + Param("localname", PN_LOCAL.leaveWhitespace())
PNAME_LN = PNAME_NS + Param("localname", PN_LOCAL.leave_whitespace())

# [142] BLANK_NODE_LABEL ::= '_:' ( PN_CHARS_U | [0-9] ) ((PN_CHARS|'.')* PN_CHARS)?
BLANK_NODE_LABEL = Regex(
"_:[0-9%s](?:[\\.%s]*[%s])?" % (PN_CHARS_U_re, PN_CHARS_re, PN_CHARS_re),
flags=re.U,
)
BLANK_NODE_LABEL.setParseAction(lambda x: rdflib.BNode(x[0][2:]))
BLANK_NODE_LABEL.set_parse_action(lambda x: rdflib.BNode(x[0][2:]))


# [166] VARNAME ::= ( PN_CHARS_U | [0-9] ) ( PN_CHARS_U | [0-9] | #x00B7 | [#x0300-#x036F] | [#x203F-#x2040] )*
Expand All @@ -269,46 +268,46 @@ def expandCollection(terms: ParseResults) -> List[List[Any]]:

# [146] INTEGER ::= [0-9]+
INTEGER = Regex(r"[0-9]+")
# INTEGER.setResultsName('integer')
INTEGER.setParseAction(lambda x: rdflib.Literal(x[0], datatype=rdflib.XSD.integer))
# INTEGER.set_results_name('integer')
INTEGER.set_parse_action(lambda x: rdflib.Literal(x[0], datatype=rdflib.XSD.integer))

# [155] EXPONENT ::= [eE] [+-]? [0-9]+
EXPONENT_re = "[eE][+-]?[0-9]+"

# [147] DECIMAL ::= [0-9]* '.' [0-9]+
DECIMAL = Regex(r"[0-9]*\.[0-9]+") # (?![eE])
# DECIMAL.setResultsName('decimal')
DECIMAL.setParseAction(lambda x: rdflib.Literal(x[0], datatype=rdflib.XSD.decimal))
# DECIMAL.set_results_name('decimal')
DECIMAL.set_parse_action(lambda x: rdflib.Literal(x[0], datatype=rdflib.XSD.decimal))

# [148] DOUBLE ::= [0-9]+ '.' [0-9]* EXPONENT | '.' ([0-9])+ EXPONENT | ([0-9])+ EXPONENT
DOUBLE = Regex(r"[0-9]+\.[0-9]*%(e)s|\.([0-9])+%(e)s|[0-9]+%(e)s" % {"e": EXPONENT_re})
# DOUBLE.setResultsName('double')
DOUBLE.setParseAction(lambda x: rdflib.Literal(x[0], datatype=rdflib.XSD.double))
# DOUBLE.set_results_name('double')
DOUBLE.set_parse_action(lambda x: rdflib.Literal(x[0], datatype=rdflib.XSD.double))


# [149] INTEGER_POSITIVE ::= '+' INTEGER
INTEGER_POSITIVE = Suppress("+") + INTEGER.copy().leaveWhitespace()
INTEGER_POSITIVE.setParseAction(
INTEGER_POSITIVE = Suppress("+") + INTEGER.copy().leave_whitespace()
INTEGER_POSITIVE.set_parse_action(
lambda x: rdflib.Literal("+" + x[0], datatype=rdflib.XSD.integer)
)

# [150] DECIMAL_POSITIVE ::= '+' DECIMAL
DECIMAL_POSITIVE = Suppress("+") + DECIMAL.copy().leaveWhitespace()
DECIMAL_POSITIVE = Suppress("+") + DECIMAL.copy().leave_whitespace()

# [151] DOUBLE_POSITIVE ::= '+' DOUBLE
DOUBLE_POSITIVE = Suppress("+") + DOUBLE.copy().leaveWhitespace()
DOUBLE_POSITIVE = Suppress("+") + DOUBLE.copy().leave_whitespace()

# [152] INTEGER_NEGATIVE ::= '-' INTEGER
INTEGER_NEGATIVE = Suppress("-") + INTEGER.copy().leaveWhitespace()
INTEGER_NEGATIVE.setParseAction(lambda x: neg(x[0]))
INTEGER_NEGATIVE = Suppress("-") + INTEGER.copy().leave_whitespace()
INTEGER_NEGATIVE.set_parse_action(lambda x: neg(x[0]))

# [153] DECIMAL_NEGATIVE ::= '-' DECIMAL
DECIMAL_NEGATIVE = Suppress("-") + DECIMAL.copy().leaveWhitespace()
DECIMAL_NEGATIVE.setParseAction(lambda x: neg(x[0]))
DECIMAL_NEGATIVE = Suppress("-") + DECIMAL.copy().leave_whitespace()
DECIMAL_NEGATIVE.set_parse_action(lambda x: neg(x[0]))

# [154] DOUBLE_NEGATIVE ::= '-' DOUBLE
DOUBLE_NEGATIVE = Suppress("-") + DOUBLE.copy().leaveWhitespace()
DOUBLE_NEGATIVE.setParseAction(lambda x: neg(x[0]))
DOUBLE_NEGATIVE = Suppress("-") + DOUBLE.copy().leave_whitespace()
DOUBLE_NEGATIVE.set_parse_action(lambda x: neg(x[0]))

# [160] ECHAR ::= '\' [tbnrf\"']
# ECHAR = Regex('\\\\[tbnrf"\']')
Expand All @@ -318,15 +317,15 @@ def expandCollection(terms: ParseResults) -> List[List[Any]]:
# STRING_LITERAL_LONG1 = Literal("'''") + ( Optional( Literal("'") | "''"
# ) + ZeroOrMore( ~ Literal("'\\") | ECHAR ) ) + "'''"
STRING_LITERAL_LONG1 = Regex("'''((?:'|'')?(?:[^'\\\\]|\\\\['ntbrf\\\\]))*'''")
STRING_LITERAL_LONG1.setParseAction(
STRING_LITERAL_LONG1.set_parse_action(
lambda x: rdflib.Literal(decodeUnicodeEscape(x[0][3:-3]))
)

# [159] STRING_LITERAL_LONG2 ::= '"""' ( ( '"' | '""' )? ( [^"\] | ECHAR ) )* '"""'
# STRING_LITERAL_LONG2 = Literal('"""') + ( Optional( Literal('"') | '""'
# ) + ZeroOrMore( ~ Literal('"\\') | ECHAR ) ) + '"""'
STRING_LITERAL_LONG2 = Regex('"""(?:(?:"|"")?(?:[^"\\\\]|\\\\["ntbrf\\\\]))*"""')
STRING_LITERAL_LONG2.setParseAction(
STRING_LITERAL_LONG2.set_parse_action(
lambda x: rdflib.Literal(decodeUnicodeEscape(x[0][3:-3]))
)

Expand All @@ -335,7 +334,7 @@ def expandCollection(terms: ParseResults) -> List[List[Any]]:
# Regex(u'[^\u0027\u005C\u000A\u000D]',flags=re.U) | ECHAR ) + "'"

STRING_LITERAL1 = Regex("'(?:[^'\\n\\r\\\\]|\\\\['ntbrf\\\\])*'(?!')", flags=re.U)
STRING_LITERAL1.setParseAction(
STRING_LITERAL1.set_parse_action(
lambda x: rdflib.Literal(decodeUnicodeEscape(x[0][1:-1]))
)

Expand All @@ -344,24 +343,24 @@ def expandCollection(terms: ParseResults) -> List[List[Any]]:
# Regex(u'[^\u0022\u005C\u000A\u000D]',flags=re.U) | ECHAR ) + '"'

STRING_LITERAL2 = Regex('"(?:[^"\\n\\r\\\\]|\\\\["ntbrf\\\\])*"(?!")', flags=re.U)
STRING_LITERAL2.setParseAction(
STRING_LITERAL2.set_parse_action(
lambda x: rdflib.Literal(decodeUnicodeEscape(x[0][1:-1]))
)

# [161] NIL ::= '(' WS* ')'
NIL = Literal("(") + ")"
NIL.setParseAction(lambda x: rdflib.RDF.nil)
NIL.set_parse_action(lambda x: rdflib.RDF.nil)

# [162] WS ::= #x20 | #x9 | #xD | #xA
# Not needed?
# WS = #x20 | #x9 | #xD | #xA
# [163] ANON ::= '[' WS* ']'
ANON = Literal("[") + "]"
ANON.setParseAction(lambda x: rdflib.BNode())
ANON.set_parse_action(lambda x: rdflib.BNode())

# A = CaseSensitiveKeyword('a')
A = Literal("a")
A.setParseAction(lambda x: rdflib.RDF.type)
A.set_parse_action(lambda x: rdflib.RDF.type)


# ------ NON-TERMINALS --------------
Expand All @@ -377,7 +376,7 @@ def expandCollection(terms: ParseResults) -> List[List[Any]]:

# [108] Var ::= VAR1 | VAR2
Var = VAR1 | VAR2
Var.setParseAction(lambda x: rdflib.term.Variable(x[0]))
Var.set_parse_action(lambda x: rdflib.term.Variable(x[0]))

# [137] PrefixedName ::= PNAME_LN | PNAME_NS
PrefixedName = Comp("pname", PNAME_LN | PNAME_NS)
Expand All @@ -394,8 +393,8 @@ def expandCollection(terms: ParseResults) -> List[List[Any]]:
"literal",
Param("string", String)
+ Optional(
Param("lang", LANGTAG.leaveWhitespace())
| Literal("^^").leaveWhitespace() + Param("datatype", iri).leaveWhitespace()
Param("lang", LANGTAG.leave_whitespace())
| Literal("^^").leave_whitespace() + Param("datatype", iri).leave_whitespace()
),
)

Expand All @@ -414,9 +413,9 @@ def expandCollection(terms: ParseResults) -> List[List[Any]]:
)

# [134] BooleanLiteral ::= 'true' | 'false'
BooleanLiteral = Keyword("true").setParseAction(lambda: rdflib.Literal(True)) | Keyword(
"false"
).setParseAction(lambda: rdflib.Literal(False))
BooleanLiteral = Keyword("true").set_parse_action(
lambda: rdflib.Literal(True)
) | Keyword("false").set_parse_action(lambda: rdflib.Literal(False))

# [138] BlankNode ::= BLANK_NODE_LABEL | ANON
BlankNode = BLANK_NODE_LABEL | ANON
Expand Down Expand Up @@ -502,7 +501,7 @@ def expandCollection(terms: ParseResults) -> List[List[Any]]:
# [91] PathElt ::= PathPrimary Optional(PathMod)
PathElt = Comp(
"PathElt",
Param("part", PathPrimary) + Optional(Param("mod", PathMod.leaveWhitespace())),
Param("part", PathPrimary) + Optional(Param("mod", PathMod.leave_whitespace())),
)

# [92] PathEltOrInverse ::= PathElt | '^' PathElt
Expand Down Expand Up @@ -542,11 +541,11 @@ def expandCollection(terms: ParseResults) -> List[List[Any]]:

# [102] Collection ::= '(' OneOrMore(GraphNode) ')'
Collection = Suppress("(") + OneOrMore(GraphNode) + Suppress(")")
Collection.setParseAction(expandCollection)
Collection.set_parse_action(expandCollection)

# [103] CollectionPath ::= '(' OneOrMore(GraphNodePath) ')'
CollectionPath = Suppress("(") + OneOrMore(GraphNodePath) + Suppress(")")
CollectionPath.setParseAction(expandCollection)
CollectionPath.set_parse_action(expandCollection)

# [80] Object ::= GraphNode
Object = GraphNode
Expand All @@ -573,13 +572,13 @@ def expandCollection(terms: ParseResults) -> List[List[Any]]:

# [99] BlankNodePropertyList ::= '[' PropertyListNotEmpty ']'
BlankNodePropertyList = Group(Suppress("[") + PropertyListNotEmpty + Suppress("]"))
BlankNodePropertyList.setParseAction(expandBNodeTriples)
BlankNodePropertyList.set_parse_action(expandBNodeTriples)

# [101] BlankNodePropertyListPath ::= '[' PropertyListPathNotEmpty ']'
BlankNodePropertyListPath = Group(
Suppress("[") + PropertyListPathNotEmpty + Suppress("]")
)
BlankNodePropertyListPath.setParseAction(expandBNodeTriples)
BlankNodePropertyListPath.set_parse_action(expandBNodeTriples)

# [98] TriplesNode ::= Collection | BlankNodePropertyList
TriplesNode <<= Collection | BlankNodePropertyList
Expand All @@ -589,7 +588,7 @@ def expandCollection(terms: ParseResults) -> List[List[Any]]:

# [75] TriplesSameSubject ::= VarOrTerm PropertyListNotEmpty | TriplesNode PropertyList
TriplesSameSubject = VarOrTerm + PropertyListNotEmpty | TriplesNode + PropertyList
TriplesSameSubject.setParseAction(expandTriples)
TriplesSameSubject.set_parse_action(expandTriples)

# [52] TriplesTemplate ::= TriplesSameSubject ( '.' TriplesTemplate? )?
# NOTE: pyparsing.py handling of recursive rules is limited by python's recursion
Expand Down Expand Up @@ -629,7 +628,7 @@ def expandCollection(terms: ParseResults) -> List[List[Any]]:
TriplesSameSubjectPath = (
VarOrTerm + PropertyListPathNotEmpty | TriplesNodePath + PropertyListPath
)
TriplesSameSubjectPath.setParseAction(expandTriples)
TriplesSameSubjectPath.set_parse_action(expandTriples)

# [55] TriplesBlock ::= TriplesSameSubjectPath ( '.' Optional(TriplesBlock) )?
TriplesBlock = Forward()
Expand All @@ -654,7 +653,7 @@ def expandCollection(terms: ParseResults) -> List[List[Any]]:
Expression = Forward()

# [72] ExpressionList ::= NIL | '(' Expression ( ',' Expression )* ')'
ExpressionList = NIL | Group(Suppress("(") + delimitedList(Expression) + Suppress(")"))
ExpressionList = NIL | Group(Suppress("(") + DelimitedList(Expression) + Suppress(")"))

# [122] RegexExpression ::= 'REGEX' '(' Expression ',' Expression ( ',' Expression )? ')'
RegexExpression = Comp(
Expand Down Expand Up @@ -1015,7 +1014,7 @@ def expandCollection(terms: ParseResults) -> List[List[Any]]:
NIL
| "("
+ Param("distinct", _Distinct)
+ delimitedList(ParamList("expr", Expression))
+ DelimitedList(ParamList("expr", Expression))
+ ")"
)

Expand Down Expand Up @@ -1101,7 +1100,11 @@ def expandCollection(terms: ParseResults) -> List[List[Any]]:
| Param("op", Keyword("IN")) + Param("other", ExpressionList)
| Param(
"op",
Combine(Keyword("NOT") + Keyword("IN"), adjacent=False, joinString=" "),
Combine(
Keyword("NOT") + Keyword("IN"),
adjacent=False,
**combine_join_kwargs(" "),
),
)
+ Param("other", ExpressionList)
),
Expand Down Expand Up @@ -1519,8 +1522,8 @@ def expandCollection(terms: ParseResults) -> List[List[Any]]:
# [1] QueryUnit ::= Query
QueryUnit = Query

QueryUnit.ignore("#" + restOfLine)
UpdateUnit.ignore("#" + restOfLine)
QueryUnit.ignore("#" + rest_of_line)
UpdateUnit.ignore("#" + rest_of_line)


expandUnicodeEscapes_re: re.Pattern = re.compile(
Expand Down Expand Up @@ -1550,7 +1553,7 @@ def parseQuery(q: Union[str, bytes, TextIO, BinaryIO]) -> ParseResults:
q = q.decode("utf-8")

q = expandUnicodeEscapes(q)
return Query.parseString(q, parseAll=True)
return Query.parse_string(q, parse_all=True)


def parseUpdate(q: Union[str, bytes, TextIO, BinaryIO]) -> CompValue:
Expand All @@ -1561,4 +1564,4 @@ def parseUpdate(q: Union[str, bytes, TextIO, BinaryIO]) -> CompValue:
q = q.decode("utf-8")

q = expandUnicodeEscapes(q)
return UpdateUnit.parseString(q, parseAll=True)[0]
return UpdateUnit.parse_string(q, parse_all=True)[0]
Loading
Loading