jenkins-bot has submitted this change and it was merged. Change subject: Remove dependency on pYsearch ...................................................................... Remove dependency on pYsearch pYsearch does not work, and an alternative implementation is not yet available. Bug: T106062 Bug: T106085 Change-Id: I162cc2cc125dc894d8a05ca711577dc37af5dcb2 (manual cherry-pick of 2ad0dd765) --- M pywikibot/config2.py M pywikibot/pagegenerators.py M requirements.txt M setup.py 4 files changed, 6 insertions(+), 6 deletions(-) Approvals: John Vandenberg: Looks good to me, but someone else must approve Yuvipanda: Looks good to me, but someone else must approve Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/config2.py b/pywikibot/config2.py index f2d644f..16c01ba 100644 --- a/pywikibot/config2.py +++ b/pywikibot/config2.py @@ -612,9 +612,8 @@ # ############# SEARCH ENGINE SETTINGS ############## -# Some scripts allow using the Yahoo! Search Web Services. To use this feature, -# you must install the pYsearch module from http://pysearch.sourceforge.net -# and get a Yahoo AppID from https://developer.yahoo.com/ +# Yahoo! Search Web Services are not operational. +# See https://phabricator.wikimedia.org/T106085 yahoo_appid = '' # To use Windows Live Search web service you must get an AppID from diff --git a/pywikibot/pagegenerators.py b/pywikibot/pagegenerators.py index dd96d21..e6420a4 100644 --- a/pywikibot/pagegenerators.py +++ b/pywikibot/pagegenerators.py @@ -2072,7 +2072,6 @@ To use this generator, install pYsearch """ - # values larger than 100 fail def __init__(self, query=None, count=100, site=None): """ Constructor. @@ -2080,6 +2079,10 @@ @param site: Site for generator results. @type site: L{pywikibot.site.BaseSite} """ + raise RuntimeError( + 'pagegenerator YahooSearchPageGenerator is not functional.\n' + 'See https://phabricator.wikimedia.org/T106085') + self.query = query or pywikibot.input(u'Please enter the search query:') self.count = count if site is None: diff --git a/requirements.txt b/requirements.txt index f3dd315..f28f9e4 100644 --- a/requirements.txt +++ b/requirements.txt @@ -25,7 +25,6 @@ pydot # core pagegenerators -pYsearch google >= 1.7 # scripts/script_wui.py: diff --git a/setup.py b/setup.py index 9a4ac85..de7bb95 100644 --- a/setup.py +++ b/setup.py @@ -62,7 +62,6 @@ extra_deps.update({ 'csv': ['unicodecsv'], 'MySQL': ['oursql'], - 'Yahoo': ['pYsearch'], }) script_deps = { -- To view, visit https://gerrit.wikimedia.org/r/258728 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I162cc2cc125dc894d8a05ca711577dc37af5dcb2 Gerrit-PatchSet: 3 Gerrit-Project: pywikibot/core Gerrit-Branch: 2.0 Gerrit-Owner: John Vandenberg &lt;jayvdb(a)gmail.com&gt; Gerrit-Reviewer: Gergő Tisza &lt;gtisza(a)wikimedia.org&gt; Gerrit-Reviewer: John Vandenberg &lt;jayvdb(a)gmail.com&gt; Gerrit-Reviewer: Ladsgroup &lt;ladsgroup(a)gmail.com&gt; Gerrit-Reviewer: Legoktm &lt;legoktm.wikipedia(a)gmail.com&gt; Gerrit-Reviewer: Yuvipanda &lt;yuvipanda(a)wikimedia.org&gt; Gerrit-Reviewer: jenkins-bot <>