Merge pull request #1151 from RDFLib/deprecate_graph_api · RDFLib/rdflib@652d2e6 (original) (raw)

1

1

`import logging

`

2

2

`from warnings import warn

`

3

3

`import random

`

4

``

`-

from rdflib.namespace import Namespace, RDF, RDFS, SKOS

`

5

``

`-

from rdflib import plugin, exceptions, query

`

``

4

`+

from rdflib.namespace import Namespace, RDF

`

``

5

`+

from rdflib import plugin, exceptions, query, namespace

`

6

6

`import rdflib.term

`

7

7

`from rdflib.term import BNode, Node, URIRef, Literal, Genid

`

8

8

`from rdflib.paths import Path

`

130

130

` >>> g.add((statementId, RDF.type, RDF.Statement))

`

131

131

` >>> g.add((statementId, RDF.subject,

`

132

132

` ... URIRef("http://rdflib.net/store/ConjunctiveGraph")))

`

133

``

`-

g.add((statementId, RDF.predicate, RDFS.label))

`

``

133

`+

g.add((statementId, RDF.predicate, namespace.RDFS.label))

`

134

134

` >>> g.add((statementId, RDF.object, Literal("Conjunctive Graph")))

`

135

135

` >>> print(len(g))

`

136

136

` 4

`

166

166

` >>> g1 = Graph()

`

167

167

` >>> g2 = Graph()

`

168

168

` >>> u = URIRef("http://example.com/foo")

`

169

``

`-

g1.add([u, RDFS.label, Literal("foo")])

`

170

``

`-

g1.add([u, RDFS.label, Literal("bar")])

`

171

``

`-

g2.add([u, RDFS.label, Literal("foo")])

`

172

``

`-

g2.add([u, RDFS.label, Literal("bing")])

`

``

169

`+

g1.add([u, namespace.RDFS.label, Literal("foo")])

`

``

170

`+

g1.add([u, namespace.RDFS.label, Literal("bar")])

`

``

171

`+

g2.add([u, namespace.RDFS.label, Literal("foo")])

`

``

172

`+

g2.add([u, namespace.RDFS.label, Literal("bing")])

`

173

173

` >>> len(g1 + g2) # adds bing as label

`

174

174

` 3

`

175

175

` >>> len(g1 - g2) # removes foo

`

`@@ -192,17 +192,17 @@

`

192

192

` >>> g1.add((stmt1, RDF.type, RDF.Statement))

`

193

193

` >>> g1.add((stmt1, RDF.subject,

`

194

194

` ... URIRef('http://rdflib.net/store/ConjunctiveGraph')))

`

195

``

`-

g1.add((stmt1, RDF.predicate, RDFS.label))

`

``

195

`+

g1.add((stmt1, RDF.predicate, namespace.RDFS.label))

`

196

196

` >>> g1.add((stmt1, RDF.object, Literal('Conjunctive Graph')))

`

197

197

` >>> g2.add((stmt2, RDF.type, RDF.Statement))

`

198

198

` >>> g2.add((stmt2, RDF.subject,

`

199

199

` ... URIRef('http://rdflib.net/store/ConjunctiveGraph')))

`

200

200

` >>> g2.add((stmt2, RDF.predicate, RDF.type))

`

201

``

`-

g2.add((stmt2, RDF.object, RDFS.Class))

`

``

201

`+

g2.add((stmt2, RDF.object, namespace.RDFS.Class))

`

202

202

` >>> g3.add((stmt3, RDF.type, RDF.Statement))

`

203

203

` >>> g3.add((stmt3, RDF.subject,

`

204

204

` ... URIRef('http://rdflib.net/store/ConjunctiveGraph')))

`

205

``

`-

g3.add((stmt3, RDF.predicate, RDFS.comment))

`

``

205

`+

g3.add((stmt3, RDF.predicate, namespace.RDFS.comment))

`

206

206

` >>> g3.add((stmt3, RDF.object, Literal(

`

207

207

` ... 'The top-level aggregate graph - The sum ' +

`

208

208

` ... 'of all named graphs within a Store')))

`

`@@ -425,12 +425,12 @@ def getitem(self, item):

`

425

425

``

426

426

` >>> import rdflib

`

427

427

` >>> g = rdflib.Graph()

`

428

``

`-

g.add((rdflib.URIRef("urn:bob"), rdflib.RDFS.label, rdflib.Literal("Bob")))

`

``

428

`+

g.add((rdflib.URIRef("urn:bob"), namespace.RDFS.label, rdflib.Literal("Bob")))

`

429

429

``

430

430

` >>> list(g[rdflib.URIRef("urn:bob")]) # all triples about bob

`

431

431

` [(rdflib.term.URIRef('http://www.w3.org/2000/01/rdf-schema#label'), rdflib.term.Literal('Bob'))]

`

432

432

``

433

``

`-

list(g[:rdflib.RDFS.label]) # all label triples

`

``

433

`+

list(g[:namespace.RDFS.label]) # all label triples

`

434

434

` [(rdflib.term.URIRef('urn:bob'), rdflib.term.Literal('Bob'))]

`

435

435

``

436

436

` >>> list(g[::rdflib.Literal("Bob")]) # all triples with bob as object

`

`@@ -710,16 +710,21 @@ def label(self, subject, default=""):

`

710

710

``

711

711

` Return default if no label exists or any label if multiple exist.

`

712

712

` """

`

``

713

`+

warn(

`

``

714

`+

DeprecationWarning(

`

``

715

`+

"graph.label() is deprecated and will be removed in rdflib 6.0.0."

`

``

716

`+

)

`

``

717

`+

)

`

713

718

`if subject is None:

`

714

719

`return default

`

715

``

`-

return self.value(subject, RDFS.label, default=default, any=True)

`

``

720

`+

return self.value(subject, namespace.RDFS.label, default=default, any=True)

`

716

721

``

717

722

`def preferredLabel(

`

718

723

`self,

`

719

724

`subject,

`

720

725

`lang=None,

`

721

726

`default=None,

`

722

``

`-

labelProperties=(SKOS.prefLabel, RDFS.label),

`

``

727

`+

labelProperties=(namespace.SKOS.prefLabel, namespace.RDFS.label),

`

723

728

` ):

`

724

729

`"""

`

725

730

` Find the preferred label for subject.

`

`@@ -732,23 +737,22 @@ def preferredLabel(

`

732

737

` Return a list of (labelProp, label) pairs, where labelProp is either

`

733

738

` skos:prefLabel or rdfs:label.

`

734

739

``

735

``

`-

from rdflib import ConjunctiveGraph, URIRef, RDFS, Literal

`

736

``

`-

from rdflib.namespace import SKOS

`

``

740

`+

from rdflib import ConjunctiveGraph, URIRef, Literal, namespace

`

737

741

` >>> from pprint import pprint

`

738

742

` >>> g = ConjunctiveGraph()

`

739

743

` >>> u = URIRef("http://example.com/foo")

`

740

``

`-

g.add([u, RDFS.label, Literal("foo")])

`

741

``

`-

g.add([u, RDFS.label, Literal("bar")])

`

``

744

`+

g.add([u, namespace.RDFS.label, Literal("foo")])

`

``

745

`+

g.add([u, namespace.RDFS.label, Literal("bar")])

`

742

746

` >>> pprint(sorted(g.preferredLabel(u)))

`

743

747

` [(rdflib.term.URIRef('http://www.w3.org/2000/01/rdf-schema#label'),

`

744

748

` rdflib.term.Literal('bar')),

`

745

749

` (rdflib.term.URIRef('http://www.w3.org/2000/01/rdf-schema#label'),

`

746

750

` rdflib.term.Literal('foo'))]

`

747

``

`-

g.add([u, SKOS.prefLabel, Literal("bla")])

`

``

751

`+

g.add([u, namespace.SKOS.prefLabel, Literal("bla")])

`

748

752

` >>> pprint(g.preferredLabel(u))

`

749

753

` [(rdflib.term.URIRef('http://www.w3.org/2004/02/skos/core#prefLabel'),

`

750

754

` rdflib.term.Literal('bla'))]

`

751

``

`-

g.add([u, SKOS.prefLabel, Literal("blubb", lang="en")])

`

``

755

`+

g.add([u, namespace.SKOS.prefLabel, Literal("blubb", lang="en")])

`

752

756

` >>> sorted(g.preferredLabel(u)) #doctest: +NORMALIZE_WHITESPACE

`

753

757

` [(rdflib.term.URIRef('http://www.w3.org/2004/02/skos/core#prefLabel'),

`

754

758

` rdflib.term.Literal('bla')),

`

`@@ -761,7 +765,11 @@ def preferredLabel(

`

761

765

` [(rdflib.term.URIRef('http://www.w3.org/2004/02/skos/core#prefLabel'),

`

762

766

` rdflib.term.Literal('blubb', lang='en'))]

`

763

767

` """

`

764

``

-

``

768

`+

warn(

`

``

769

`+

DeprecationWarning(

`

``

770

`+

"graph.preferredLabel() is deprecated and will be removed in rdflib 6.0.0."

`

``

771

`+

)

`

``

772

`+

)

`

765

773

`if default is None:

`

766

774

`default = []

`

767

775

``

`@@ -795,9 +803,14 @@ def comment(self, subject, default=""):

`

795

803

``

796

804

` Return default if no comment exists

`

797

805

` """

`

``

806

`+

warn(

`

``

807

`+

DeprecationWarning(

`

``

808

`+

"graph.comment() is deprecated and will be removed in rdflib 6.0.0."

`

``

809

`+

)

`

``

810

`+

)

`

798

811

`if subject is None:

`

799

812

`return default

`

800

``

`-

return self.value(subject, RDFS.comment, default=default, any=True)

`

``

813

`+

return self.value(subject, namespace.RDFS.comment, default=default, any=True)

`

801

814

``

802

815

`def items(self, list):

`

803

816

`"""Generator over all items in the resource specified by list

`

`@@ -826,9 +839,9 @@ def transitiveClosure(self, func, arg, seen=None):

`

826

839

` >>> c=BNode("baz")

`

827

840

` >>> g.add((a,RDF.first,RDF.type))

`

828

841

` >>> g.add((a,RDF.rest,b))

`

829

``

`-

g.add((b,RDF.first,RDFS.label))

`

``

842

`+

g.add((b,RDF.first,namespace.RDFS.label))

`

830

843

` >>> g.add((b,RDF.rest,c))

`

831

``

`-

g.add((c,RDF.first,RDFS.comment))

`

``

844

`+

g.add((c,RDF.first,namespace.RDFS.comment))

`

832

845

` >>> g.add((c,RDF.rest,RDF.nil))

`

833

846

` >>> def topList(node,g):

`

834

847

` ... for s in g.subjects(RDF.rest, node):

`

`@@ -902,6 +915,11 @@ def seq(self, subject):

`

902

915

``

903

916

` If yes, it returns a Seq class instance, None otherwise.

`

904

917

` """

`

``

918

`+

warn(

`

``

919

`+

DeprecationWarning(

`

``

920

`+

"graph.seq() is deprecated and will be removed in rdflib 6.0.0."

`

``

921

`+

)

`

``

922

`+

)

`

905

923

`if (subject, RDF.type, RDF.Seq) in self:

`

906

924

`return Seq(self, subject)

`

907

925

`else:

`