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
---
M pywikibot/config2.py
M pywikibot/pagegenerators.py
M requirements.txt
M setup.py
4 files changed, 6 insertions(+), 8 deletions(-)
Approvals:
Xqt: Looks good to me, approved
jenkins-bot: Verified
diff --git a/pywikibot/config2.py b/pywikibot/config2.py
index 0acc717..bd541a6 100644
--- a/pywikibot/config2.py
+++ b/pywikibot/config2.py
@@ -613,9 +613,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 4fe6fad..7971750 100644
--- a/pywikibot/pagegenerators.py
+++ b/pywikibot/pagegenerators.py
@@ -2118,7 +2118,6 @@
To use this generator, install pYsearch
"""
- # values larger than 100 fail
@deprecated_args(count='total')
def __init__(self, query=None, total=100, site=None):
"""
@@ -2127,6 +2126,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.total = total
if site is None:
diff --git a/requirements.txt b/requirements.txt
index e2b14dd..e0f5a1f 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -44,9 +44,6 @@
Pillow
# core pagegenerators
---allow-external pYsearch
---allow-unverified pYsearch
-pYsearch ; python_version < '3'
google >= 1.7
socketIO-client<0.6.1
diff --git a/setup.py b/setup.py
index b65277b..c07fdbe 100644
--- a/setup.py
+++ b/setup.py
@@ -35,7 +35,6 @@
extra_deps.update({
'csv': ['unicodecsv'],
'MySQL': ['oursql'],
- 'Yahoo': ['pYsearch'],
})
script_deps = {
--
To view, visit
https://gerrit.wikimedia.org/r/225219
To unsubscribe, visit
https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I162cc2cc125dc894d8a05ca711577dc37af5dcb2
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: John Vandenberg <jayvdb(a)gmail.com>
Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com>
Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl>
Gerrit-Reviewer: Xqt <info(a)gno.de>
Gerrit-Reviewer: jenkins-bot <>