[Pywikibot-commits] [Gerrit] pywikibot/core[master]: [Bug] Inject correct dependencies to SparqlQuery

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/348042 ) Change subject: [Bug] Inject correct dependencies to SparqlQuery ...................................................................... [Bug] Inject correct dependencies to SparqlQuery I057335a broke most (third-party) usages of WikidataSPARQLPageGenerator because only providing the endpoint to the SparqlQuery interface now throws an error. The user can now just provide the repository if it's enough, otherwise they need to provide the mandatory dependencies as well. The decision about whether it's enough is now made inside SparqlQuery. Change-Id: I2c2c383b39b3684d8aaed0375ab4253168c135e3 --- M pywikibot/pagegenerators.py 1 file changed, 9 insertions(+), 14 deletions(-) Approvals: Lokal Profil: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/pagegenerators.py b/pywikibot/pagegenerators.py index d5a56f0..7809ee6 100644 --- a/pywikibot/pagegenerators.py +++ b/pywikibot/pagegenerators.py @@ -2743,12 +2743,16 @@ def WikidataSPARQLPageGenerator(query, site=None, item_name='item', endpoint=None, - result_type=set): + entity_url=None, result_type=set): """Generate pages that result from the given SPARQL query. @param query: the SPARQL query string. @param site: Site for generator results. @type site: L{pywikibot.site.BaseSite} + @param endpoint: SPARQL endpoint URL + @type endpoint: string + @param entity_url: URL prefix for any entities returned in a query. + @type entity_url: string @param result_type: type of the iterable in which SPARQL results are stored (default set) @type result_type: iterable @@ -2759,19 +2763,10 @@ if site is None: site = pywikibot.Site() repo = site.data_repository() - if endpoint is None: - try: - endpoint = repo.sparql_endpoint - except NotImplementedError: - raise NotImplementedError( - 'Wiki version must be 1.28-wmf.23 or newer to automatically ' - 'extract the sparql endpoint. Please provide the endpoint ' - 'parameter as well.') - if not endpoint: - pywikibot.error('The site {0} does not provide a sparql endpoint.' - .format(repo)) - - query_object = sparql.SparqlQuery(endpoint=endpoint) + dependencies = dict(endpoint=endpoint, entity_url=entity_url) + if not endpoint or not entity_url: + dependencies['repo'] = repo + query_object = sparql.SparqlQuery(**dependencies) data = query_object.get_items(query, item_name=item_name, result_type=result_type) -- To view, visit https://gerrit.wikimedia.org/r/348042 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2c2c383b39b3684d8aaed0375ab4253168c135e3 Gerrit-PatchSet: 4 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Matěj Suchánek &lt;matejsuchanek97(a)gmail.com&gt; Gerrit-Reviewer: Dalba &lt;dalba.wiki(a)gmail.com&gt; Gerrit-Reviewer: Lokal Profil &lt;lokal.profil(a)gmail.com&gt; Gerrit-Reviewer: Magul &lt;tomasz.magulski(a)gmail.com&gt; Gerrit-Reviewer: Matěj Suchánek &lt;matejsuchanek97(a)gmail.com&gt; Gerrit-Reviewer: Mpaa &lt;mpaa.wiki(a)gmail.com&gt; Gerrit-Reviewer: Xqt &lt;info(a)gno.de&gt; Gerrit-Reviewer: jenkins-bot <>