Skip to content

Commit b9d6c70

Browse files
committed
wip
1 parent 91d6436 commit b9d6c70

File tree

12 files changed

+236
-207
lines changed

12 files changed

+236
-207
lines changed

rdflib/plugins/sparql/processor.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,9 @@ class SPARQLUpdateProcessor(UpdateProcessor):
5555
def __init__(self, graph):
5656
self.graph = graph
5757

58-
def update(self, strOrQuery, initBindings={}, initNs={}):
58+
def update(self, strOrQuery, initBindings={}, initNs={}, base=None):
5959
if isinstance(strOrQuery, str):
60-
strOrQuery = translateUpdate(parseUpdate(strOrQuery), initNs=initNs)
60+
strOrQuery = translateUpdate(parseUpdate(strOrQuery), base, initNs=initNs)
6161

6262
return evalUpdate(self.graph, strOrQuery, initBindings)
6363

rdflib/term.py

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -597,12 +597,6 @@ def __new__(
597597
datatype: Optional[str] = None,
598598
normalize: Optional[bool] = None,
599599
) -> "Literal":
600-
# logging.debug(
601-
# "lexical_or_value = %r, datatype = %s, lang = %s",
602-
# lexical_or_value,
603-
# datatype,
604-
# lang,
605-
# )
606600

607601
if lang == "":
608602
lang = None # no empty lang-tags in RDF
@@ -680,13 +674,6 @@ def __new__(
680674
inst._value = value
681675
inst._ill_formed = ill_formed
682676

683-
# logging.debug(
684-
# "inst = %s, value = %s, ill_formed = %s",
685-
# inst,
686-
# value,
687-
# ill_formed,
688-
# )
689-
690677
return inst
691678

692679
def normalize(self) -> "Literal":

test/test_w3c_spec/test_nquads_w3c_new.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,9 @@ def check_entry(entry: ManifestEntry) -> None:
5050
graph_data = dataset.serialize(format="nquads")
5151
result_dataset = Dataset()
5252
result_dataset.parse(data=graph_data, publicID=entry.action, format="nquads")
53+
GraphHelper.assert_datasets_isomorphic(
54+
dataset, result_dataset, exclude_bnodes=True
55+
)
5356
GraphHelper.assert_sets_equals(
5457
dataset, result_dataset, bnode_handling=BNodeHandling.COLLAPSE
5558
)

test/test_w3c_spec/test_sparql_w3c.py

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@
3535
from rdflib.query import Result
3636
from rdflib.term import Identifier, Node
3737

38+
logger = logging.getLogger(__name__)
39+
3840

3941
def eq(a, b, msg):
4042
# return eq_(a, b, msg + ": (%r!=%r)" % (a, b))
@@ -228,10 +230,22 @@ def update_test(t: RDFTest):
228230
for x, l in graphdata:
229231
g.parse(x, publicID=URIRef(l), format=_fmt(x))
230232

233+
if logger.isEnabledFor(logging.DEBUG):
234+
logging.debug(
235+
"dataset before = \n%s",
236+
g.serialize(format="trig"),
237+
)
238+
231239
with bopen(query_path) as f:
232240
req = translateUpdate(parseUpdate(f))
233241
evalUpdate(g, req)
234242

243+
if logger.isEnabledFor(logging.DEBUG):
244+
logging.debug(
245+
"dataset after = \n%s",
246+
g.serialize(format="trig"),
247+
)
248+
235249
# read expected results
236250
resg = Dataset()
237251
if resdata:
@@ -241,6 +255,12 @@ def update_test(t: RDFTest):
241255
for x, l in resgraphdata:
242256
resg.parse(x, publicID=URIRef(l), format=_fmt(x))
243257

258+
if logger.isEnabledFor(logging.DEBUG):
259+
logging.debug(
260+
"expected dataset = \n%s",
261+
resg.serialize(format="trig"),
262+
)
263+
244264
eq(
245265
set(ctx.identifier for ctx in g.contexts() if ctx != g.default_context),
246266
set(

0 commit comments

Comments
 (0)