Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
13 changes: 9 additions & 4 deletions rdflib/plugins/parsers/notation3.py
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@
"Formula",
"RDFSink",
"SinkParser",
"sfloat",
]

from rdflib.parser import Parser
Expand Down Expand Up @@ -380,6 +381,10 @@ def unicodeExpand(m: Match) -> str:
langcode = re.compile(r"[a-zA-Z0-9]+(-[a-zA-Z0-9]+)*")


class sfloat(str): # noqa: N801
"""don't normalize raw XSD.double string representation"""


class SinkParser:
def __init__(
self,
Expand Down Expand Up @@ -1528,7 +1533,7 @@ def nodeOrLiteral(self, argstr: str, i: int, res: MutableSequence[Any]) -> int:
m = exponent_syntax.match(argstr, i)
if m:
j = m.end()
res.append(float(argstr[i:j]))
res.append(sfloat(argstr[i:j]))
return j

m = decimal_syntax.match(argstr, i)
Expand Down Expand Up @@ -1911,7 +1916,7 @@ def makeStatement(
def normalise(
self,
f: Optional[Formula],
n: Union[Tuple[int, str], bool, int, Decimal, float, _AnyT],
n: Union[Tuple[int, str], bool, int, Decimal, sfloat, _AnyT],
) -> Union[URIRef, Literal, BNode, _AnyT]:
if isinstance(n, tuple):
return URIRef(str(n[1]))
Expand All @@ -1931,7 +1936,7 @@ def normalise(
s = Literal(value, datatype=DECIMAL_DATATYPE)
return s

if isinstance(n, float):
if isinstance(n, sfloat):
s = Literal(str(n), datatype=DOUBLE_DATATYPE)
return s

Expand All @@ -1947,7 +1952,7 @@ def normalise(
# f.universals[n] = f.newBlankNode()
# return f.universals[n]
# type error: Incompatible return value type (got "Union[int, _AnyT]", expected "Union[URIRef, Literal, BNode, _AnyT]") [return-value]
return n # type: ignore[return-value]
return n

def intern(self, something: _AnyT) -> _AnyT:
return something
Expand Down
17 changes: 17 additions & 0 deletions test/test_n3.py
Original file line number Diff line number Diff line change
Expand Up @@ -251,6 +251,23 @@ def test_empty_prefix(self):
g2
), "Document with declared empty prefix must match default #"

@pytest.mark.parametrize(
"do_normalize_literal, expected_result",
[(True, {"1.0", "10000000000.0"}), (False, {"1e10", "1e0"})],
)
def test_float_no_norm(self, do_normalize_literal, expected_result):
import rdflib

original_normalize_literal = rdflib.NORMALIZE_LITERALS
try:
rdflib.NORMALIZE_LITERALS = do_normalize_literal
g1 = Graph()
g1.parse(data=":a :b 1e10, 1e0 .", format="n3")
values = set(str(o) for o in g1.objects())
assert values == expected_result
finally:
rdflib.NORMALIZE_LITERALS = original_normalize_literal


class TestRegularExpressions:
def test_exponents(self):
Expand Down
Loading