diff options
| -rw-r--r-- | rdflib/graph.py | 7 | ||||
| -rw-r--r-- | rdflib/namespace.py | 2 | ||||
| -rw-r--r-- | rdflib/store/FOPLRelationalModel/BinaryRelationPartition.py | 2 | ||||
| -rw-r--r-- | rdflib/store/Redland.py | 17 | ||||
| -rw-r--r-- | rdflib/term.py | 5 |
5 files changed, 19 insertions, 14 deletions
diff --git a/rdflib/graph.py b/rdflib/graph.py index 8d2f431c..80e5c82d 100644 --- a/rdflib/graph.py +++ b/rdflib/graph.py @@ -129,19 +129,20 @@ SPARQL Queries ... PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> SELECT ?pred WHERE { ?stmt rdf:predicate ?pred. } ... \'\'\' >>> for pred in g.query(q): print pred - (rdflib.URIRef('http://www.w3.org/2000/01/rdf-schema#label'),) + (rdflib.term.URIRef('http://www.w3.org/2000/01/rdf-schema#label'),) SPARQL Queries with namespace bindings as argument >>> nsMap = {u"rdf":RDF.RDFNS} >>> for pred in g.query("SELECT ?pred WHERE { ?stmt rdf:predicate ?pred. }", initNs=nsMap): print pred - (rdflib.URIRef('http://www.w3.org/2000/01/rdf-schema#label'),) + (rdflib.term.URIRef('http://www.w3.org/2000/01/rdf-schema#label'),) Parameterized SPARQL Queries + >>> from rdflib.term import Variable >>> top = { Variable("?term") : RDF.predicate } >>> for pred in g.query("SELECT ?pred WHERE { ?stmt ?term ?pred. }", initBindings=top): print pred - (rdflib.URIRef('http://www.w3.org/2000/01/rdf-schema#label'),) + (rdflib.term.URIRef('http://www.w3.org/2000/01/rdf-schema#label'),) """ diff --git a/rdflib/namespace.py b/rdflib/namespace.py index faee2e17..02d56a4a 100644 --- a/rdflib/namespace.py +++ b/rdflib/namespace.py @@ -129,3 +129,5 @@ RDFS = ClosedNamespace( ) OWL = Namespace('http://www.w3.org/2002/07/owl#') + +_XSD_NS = Namespace('http://www.w3.org/2001/XMLSchema#') diff --git a/rdflib/store/FOPLRelationalModel/BinaryRelationPartition.py b/rdflib/store/FOPLRelationalModel/BinaryRelationPartition.py index 6f720fab..412a824f 100644 --- a/rdflib/store/FOPLRelationalModel/BinaryRelationPartition.py +++ b/rdflib/store/FOPLRelationalModel/BinaryRelationPartition.py @@ -654,7 +654,7 @@ class NamedLiteralProperties(BinaryRelationPartition): def extractIdentifiers(self,quadSlots): """ Test literal data type extraction - >>> from rdflib import RDF + >>> from rdflib.namespace import RDF >>> class DummyClass: ... def __init__(self,test=False): ... self.test = test diff --git a/rdflib/store/Redland.py b/rdflib/store/Redland.py index 6445bd3d..142d2a58 100644 --- a/rdflib/store/Redland.py +++ b/rdflib/store/Redland.py @@ -1,10 +1,7 @@ import rdflib from rdflib.graph import Graph -from rdflib.URIRef import URIRef -from rdflib.Node import Node -from rdflib.BNode import BNode -from rdflib.Literal import Literal +from rdflib.term import URIRef, Node, BNode, Literal try: import RDF except ImportError: @@ -15,11 +12,11 @@ except ImportError: from rdflib.store import Store def _t(i): - if isinstance(i, rdflib.URIRef): + if isinstance(i, rdflib.term.URIRef): return RDF.Node(RDF.Uri(unicode(i))) - if isinstance(i, rdflib.BNode): + if isinstance(i, rdflib.term.BNode): return RDF.Node(blank=str(i)) - if isinstance(i, rdflib.Literal): + if isinstance(i, rdflib.term.Literal): return RDF.Node(literal=str(i)) if isinstance(i, Graph): return _t(i.identifier) @@ -33,12 +30,12 @@ def _c(i): def _f(i): if isinstance(i, RDF.Uri): - return rdflib.URIRef(i) + return rdflib.term.URIRef(i) if isinstance(i, RDF.Node): if i.is_blank(): - return rdflib.BNode(i.blank_identifier) + return rdflib.term.BNode(i.blank_identifier) elif i.is_literal(): - return rdflib.Literal(i) + return rdflib.term.Literal(i) else: return URIRef(i.uri) if i is None: diff --git a/rdflib/term.py b/rdflib/term.py index e9bb3ae9..87e12ea3 100644 --- a/rdflib/term.py +++ b/rdflib/term.py @@ -234,6 +234,7 @@ class Literal(Identifier): 1L >>> cmp(Literal("adsf"), 1) 1 + >>> from rdflib.namespace import _XSD_NS >>> lit2006 = Literal('2006-01-01',datatype=_XSD_NS.date) >>> lit2006.toPython() datetime.date(2006, 1, 1) @@ -315,6 +316,7 @@ class Literal(Identifier): def __lt__(self, other): """ + >>> from rdflib.namespace import _XSD_NS >>> Literal("YXNkZg==", datatype=_XSD_NS[u'base64Binary']) < "foo" True >>> u"\xfe" < Literal(u"foo") @@ -337,6 +339,7 @@ class Literal(Identifier): def __le__(self, other): """ + >>> from rdflib.namespace import _XSD_NS >>> Literal('2007-01-01T10:00:00', datatype=_XSD_NS.dateTime) <= Literal('2007-01-01T10:00:00', datatype=_XSD_NS.dateTime) True """ @@ -383,6 +386,7 @@ class Literal(Identifier): def __hash__(self): """ + >>> from rdflib.namespace import _XSD_NS >>> a = {Literal('1',datatype=_XSD_NS.integer):'one'} >>> Literal('1',datatype=_XSD_NS.double) in a False @@ -423,6 +427,7 @@ class Literal(Identifier): False >>> Literal("1", datatype=URIRef("foo")) == "asdf" False + >>> from rdflib.namespace import _XSD_NS >>> Literal('2007-01-01', datatype=_XSD_NS.date) == Literal('2007-01-01', datatype=_XSD_NS.date) True >>> Literal('2007-01-01', datatype=_XSD_NS.date) == date(2007, 1, 1) |