Skip to content

Commit 9f21436

Browse files
ajnelson-nistajnelson-nist
committed
Remove unicode string form in rdflib/term.py
References: * #2378 Signed-off-by: Alex Nelson <alexander.nelson@nist.gov>
1 parent cbd6151 commit 9f21436

File tree

1 file changed

+41
-41
lines changed

1 file changed

+41
-41
lines changed

‎rdflib/term.py‎

Lines changed: 41 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -574,7 +574,7 @@ class Literal(Identifier):
574574
>>> lit2006 < Literal('2007-01-01',datatype=XSD.date)
575575
True
576576
>>> Literal(datetime.utcnow()).datatype
577-
rdflib.term.URIRef(u'http://www.w3.org/2001/XMLSchema#dateTime')
577+
rdflib.term.URIRef('http://www.w3.org/2001/XMLSchema#dateTime')
578578
>>> Literal(1) > Literal(2) # by value
579579
False
580580
>>> Literal(1) > Literal(2.0) # by value
@@ -696,11 +696,11 @@ def normalize(self) -> "Literal":
696696
of this literal
697697
>>> from rdflib import XSD
698698
>>> Literal("01", datatype=XSD.integer, normalize=False).normalize()
699-
rdflib.term.Literal(u'1', datatype=rdflib.term.URIRef(u'http://www.w3.org/2001/XMLSchema#integer'))
699+
rdflib.term.Literal('1', datatype=rdflib.term.URIRef('http://www.w3.org/2001/XMLSchema#integer'))
700700
701701
Illegal lexical forms for the datatype given are simply passed on
702702
>>> Literal("a", datatype=XSD.integer, normalize=False)
703-
rdflib.term.Literal(u'a', datatype=rdflib.term.URIRef(u'http://www.w3.org/2001/XMLSchema#integer'))
703+
rdflib.term.Literal('a', datatype=rdflib.term.URIRef('http://www.w3.org/2001/XMLSchema#integer'))
704704
705705
"""
706706

@@ -754,9 +754,9 @@ def __add__(self, val: Any) -> "Literal":
754754
"""
755755
>>> from rdflib.namespace import XSD
756756
>>> Literal(1) + 1
757-
rdflib.term.Literal(u'2', datatype=rdflib.term.URIRef(u'http://www.w3.org/2001/XMLSchema#integer'))
757+
rdflib.term.Literal('2', datatype=rdflib.term.URIRef('http://www.w3.org/2001/XMLSchema#integer'))
758758
>>> Literal("1") + "1"
759-
rdflib.term.Literal(u'11')
759+
rdflib.term.Literal('11')
760760
761761
# Handling dateTime/date/time based operations in Literals
762762
>>> a = Literal('2006-01-01T20:50:00', datatype=XSD.dateTime)
@@ -970,17 +970,17 @@ def __bool__(self) -> bool:
970970
def __neg__(self) -> "Literal":
971971
"""
972972
>>> (- Literal(1))
973-
rdflib.term.Literal(u'-1', datatype=rdflib.term.URIRef(u'http://www.w3.org/2001/XMLSchema#integer'))
973+
rdflib.term.Literal('-1', datatype=rdflib.term.URIRef('http://www.w3.org/2001/XMLSchema#integer'))
974974
>>> (- Literal(10.5))
975-
rdflib.term.Literal(u'-10.5', datatype=rdflib.term.URIRef(u'http://www.w3.org/2001/XMLSchema#double'))
975+
rdflib.term.Literal('-10.5', datatype=rdflib.term.URIRef('http://www.w3.org/2001/XMLSchema#double'))
976976
>>> from rdflib.namespace import XSD
977977
>>> (- Literal("1", datatype=XSD.integer))
978-
rdflib.term.Literal(u'-1', datatype=rdflib.term.URIRef(u'http://www.w3.org/2001/XMLSchema#integer'))
978+
rdflib.term.Literal('-1', datatype=rdflib.term.URIRef('http://www.w3.org/2001/XMLSchema#integer'))
979979
980980
>>> (- Literal("1"))
981981
Traceback (most recent call last):
982982
File "<stdin>", line 1, in <module>
983-
TypeError: Not a number; rdflib.term.Literal(u'1')
983+
TypeError: Not a number; rdflib.term.Literal('1')
984984
>>>
985985
"""
986986

@@ -992,17 +992,17 @@ def __neg__(self) -> "Literal":
992992
def __pos__(self) -> "Literal":
993993
"""
994994
>>> (+ Literal(1))
995-
rdflib.term.Literal(u'1', datatype=rdflib.term.URIRef(u'http://www.w3.org/2001/XMLSchema#integer'))
995+
rdflib.term.Literal('1', datatype=rdflib.term.URIRef('http://www.w3.org/2001/XMLSchema#integer'))
996996
>>> (+ Literal(-1))
997-
rdflib.term.Literal(u'-1', datatype=rdflib.term.URIRef(u'http://www.w3.org/2001/XMLSchema#integer'))
997+
rdflib.term.Literal('-1', datatype=rdflib.term.URIRef('http://www.w3.org/2001/XMLSchema#integer'))
998998
>>> from rdflib.namespace import XSD
999999
>>> (+ Literal("-1", datatype=XSD.integer))
1000-
rdflib.term.Literal(u'-1', datatype=rdflib.term.URIRef(u'http://www.w3.org/2001/XMLSchema#integer'))
1000+
rdflib.term.Literal('-1', datatype=rdflib.term.URIRef('http://www.w3.org/2001/XMLSchema#integer'))
10011001
10021002
>>> (+ Literal("1"))
10031003
Traceback (most recent call last):
10041004
File "<stdin>", line 1, in <module>
1005-
TypeError: Not a number; rdflib.term.Literal(u'1')
1005+
TypeError: Not a number; rdflib.term.Literal('1')
10061006
"""
10071007
if isinstance(self.value, (int, long_type, float)):
10081008
return Literal(self.value.__pos__())
@@ -1012,16 +1012,16 @@ def __pos__(self) -> "Literal":
10121012
def __abs__(self) -> "Literal":
10131013
"""
10141014
>>> abs(Literal(-1))
1015-
rdflib.term.Literal(u'1', datatype=rdflib.term.URIRef(u'http://www.w3.org/2001/XMLSchema#integer'))
1015+
rdflib.term.Literal('1', datatype=rdflib.term.URIRef('http://www.w3.org/2001/XMLSchema#integer'))
10161016
10171017
>>> from rdflib.namespace import XSD
10181018
>>> abs( Literal("-1", datatype=XSD.integer))
1019-
rdflib.term.Literal(u'1', datatype=rdflib.term.URIRef(u'http://www.w3.org/2001/XMLSchema#integer'))
1019+
rdflib.term.Literal('1', datatype=rdflib.term.URIRef('http://www.w3.org/2001/XMLSchema#integer'))
10201020
10211021
>>> abs(Literal("1"))
10221022
Traceback (most recent call last):
10231023
File "<stdin>", line 1, in <module>
1024-
TypeError: Not a number; rdflib.term.Literal(u'1')
1024+
TypeError: Not a number; rdflib.term.Literal('1')
10251025
"""
10261026
if isinstance(self.value, (int, long_type, float)):
10271027
return Literal(self.value.__abs__())
@@ -1031,18 +1031,18 @@ def __abs__(self) -> "Literal":
10311031
def __invert__(self) -> "Literal":
10321032
"""
10331033
>>> ~(Literal(-1))
1034-
rdflib.term.Literal(u'0', datatype=rdflib.term.URIRef(u'http://www.w3.org/2001/XMLSchema#integer'))
1034+
rdflib.term.Literal('0', datatype=rdflib.term.URIRef('http://www.w3.org/2001/XMLSchema#integer'))
10351035
10361036
>>> from rdflib.namespace import XSD
10371037
>>> ~( Literal("-1", datatype=XSD.integer))
1038-
rdflib.term.Literal(u'0', datatype=rdflib.term.URIRef(u'http://www.w3.org/2001/XMLSchema#integer'))
1038+
rdflib.term.Literal('0', datatype=rdflib.term.URIRef('http://www.w3.org/2001/XMLSchema#integer'))
10391039
10401040
Not working:
10411041
10421042
>>> ~(Literal("1"))
10431043
Traceback (most recent call last):
10441044
File "<stdin>", line 1, in <module>
1045-
TypeError: Not a number; rdflib.term.Literal(u'1')
1045+
TypeError: Not a number; rdflib.term.Literal('1')
10461046
"""
10471047
if isinstance(self.value, (int, long_type, float)):
10481048
# type error: Unsupported operand type for ~ ("float")
@@ -1423,51 +1423,51 @@ def n3(self, namespace_manager: Optional["NamespaceManager"] = None) -> str:
14231423
Examples::
14241424
14251425
>>> Literal("foo").n3()
1426-
u'"foo"'
1426+
'"foo"'
14271427
14281428
Strings with newlines or triple-quotes::
14291429
14301430
>>> Literal("foo\nbar").n3()
1431-
u'"""foo\nbar"""'
1431+
'"""foo\nbar"""'
14321432
14331433
>>> Literal("''\'").n3()
1434-
u'"\'\'\'"'
1434+
'"\'\'\'"'
14351435
14361436
>>> Literal('"""').n3()
1437-
u'"\\"\\"\\""'
1437+
'"\\"\\"\\""'
14381438
14391439
Language::
14401440
14411441
>>> Literal("hello", lang="en").n3()
1442-
u'"hello"@en'
1442+
'"hello"@en'
14431443
14441444
Datatypes::
14451445
14461446
>>> Literal(1).n3()
1447-
u'"1"^^<http://www.w3.org/2001/XMLSchema#integer>'
1447+
'"1"^^<http://www.w3.org/2001/XMLSchema#integer>'
14481448
14491449
>>> Literal(1.0).n3()
1450-
u'"1.0"^^<http://www.w3.org/2001/XMLSchema#double>'
1450+
'"1.0"^^<http://www.w3.org/2001/XMLSchema#double>'
14511451
14521452
>>> Literal(True).n3()
1453-
u'"true"^^<http://www.w3.org/2001/XMLSchema#boolean>'
1453+
'"true"^^<http://www.w3.org/2001/XMLSchema#boolean>'
14541454
14551455
Datatype and language isn't allowed (datatype takes precedence)::
14561456
14571457
>>> Literal(1, lang="en").n3()
1458-
u'"1"^^<http://www.w3.org/2001/XMLSchema#integer>'
1458+
'"1"^^<http://www.w3.org/2001/XMLSchema#integer>'
14591459
14601460
Custom datatype::
14611461
14621462
>>> footype = URIRef("http://example.org/ns#foo")
14631463
>>> Literal("1", datatype=footype).n3()
1464-
u'"1"^^<http://example.org/ns#foo>'
1464+
'"1"^^<http://example.org/ns#foo>'
14651465
14661466
Passing a namespace-manager will use it to abbreviate datatype URIs:
14671467
14681468
>>> from rdflib import Graph
14691469
>>> Literal(1).n3(Graph().namespace_manager)
1470-
u'"1"^^xsd:integer'
1470+
'"1"^^xsd:integer'
14711471
'''
14721472
if namespace_manager:
14731473
return self._literal_n3(qname_callback=namespace_manager.normalizeUri)
@@ -1484,43 +1484,43 @@ def _literal_n3(
14841484
>>> from rdflib.namespace import XSD
14851485
14861486
>>> Literal(1)._literal_n3(use_plain=True)
1487-
u'1'
1487+
'1'
14881488
14891489
>>> Literal(1.0)._literal_n3(use_plain=True)
1490-
u'1e+00'
1490+
'1e+00'
14911491
14921492
>>> Literal(1.0, datatype=XSD.decimal)._literal_n3(use_plain=True)
1493-
u'1.0'
1493+
'1.0'
14941494
14951495
>>> Literal(1.0, datatype=XSD.float)._literal_n3(use_plain=True)
1496-
u'"1.0"^^<http://www.w3.org/2001/XMLSchema#float>'
1496+
'"1.0"^^<http://www.w3.org/2001/XMLSchema#float>'
14971497
14981498
>>> Literal("foo", datatype=XSD.string)._literal_n3(
14991499
... use_plain=True)
1500-
u'"foo"^^<http://www.w3.org/2001/XMLSchema#string>'
1500+
'"foo"^^<http://www.w3.org/2001/XMLSchema#string>'
15011501
15021502
>>> Literal(True)._literal_n3(use_plain=True)
1503-
u'true'
1503+
'true'
15041504
15051505
>>> Literal(False)._literal_n3(use_plain=True)
1506-
u'false'
1506+
'false'
15071507
15081508
>>> Literal(1.91)._literal_n3(use_plain=True)
1509-
u'1.91e+00'
1509+
'1.91e+00'
15101510
15111511
Only limited precision available for floats:
15121512
>>> Literal(0.123456789)._literal_n3(use_plain=True)
1513-
u'1.234568e-01'
1513+
'1.234568e-01'
15141514
15151515
>>> Literal('0.123456789',
15161516
... datatype=XSD.decimal)._literal_n3(use_plain=True)
1517-
u'0.123456789'
1517+
'0.123456789'
15181518
15191519
Using callback for datatype QNames::
15201520
15211521
>>> Literal(1)._literal_n3(
15221522
... qname_callback=lambda uri: "xsd:integer")
1523-
u'"1"^^xsd:integer'
1523+
'"1"^^xsd:integer'
15241524
15251525
"""
15261526
if use_plain and self.datatype in _PLAIN_LITERAL_TYPES:

0 commit comments

Comments
 (0)