diff options
| author | Jörn Hees <joernhees@users.noreply.github.com> | 2015-09-10 16:57:04 +0200 |
|---|---|---|
| committer | Jörn Hees <joernhees@users.noreply.github.com> | 2015-09-10 16:57:04 +0200 |
| commit | e186b5f4a37ebd1613d3128834fc10fe03487bba (patch) | |
| tree | 061b4eeabc46b5a31115c394fb2a2b0f14aac14e | |
| parent | 5f9e03b9eb4ca7a52e3aeb35d996c78202ed09f3 (diff) | |
| parent | 04d7d79002fa084262a09253af2371fb99cc1afd (diff) | |
| download | rdflib-e186b5f4a37ebd1613d3128834fc10fe03487bba.tar.gz | |
Merge pull request #522 from joernhees/sparql_store_empty_prefix_newline
injectPrefixes only modifies query if prefixes present and if adds a newline in between
| -rw-r--r-- | rdflib/plugins/stores/sparqlstore.py | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/rdflib/plugins/stores/sparqlstore.py b/rdflib/plugins/stores/sparqlstore.py index 9db722a7..c265249a 100644 --- a/rdflib/plugins/stores/sparqlstore.py +++ b/rdflib/plugins/stores/sparqlstore.py @@ -75,10 +75,15 @@ class NSSPARQLWrapper(SPARQLWrapper): self.queryString = self.injectPrefixes(query) def injectPrefixes(self, query): - return '\n'.join( - ['\n'.join(['PREFIX %s: <%s>' % (key, val) - for key, val in self.nsBindings.items()]), - query]) + prefixes = self.nsBindings.items() + if not prefixes: + return query + return '\n'.join([ + '\n'.join(['PREFIX %s: <%s>' % (k, v) for k, v in prefixes]), + '', # separate prefixes from query with an empty line + query + ]) + BNODE_IDENT_PATTERN = re.compile('(?P<label>_\:[^\s]+)') SPARQL_NS = Namespace('http://www.w3.org/2005/sparql-results#') |