From bbf5acafbb03aa15bbe97424eaa1c1f7fa2fa015 Mon Sep 17 00:00:00 2001 From: nemunaire Date: Fri, 25 Sep 2015 07:32:46 +0200 Subject: [PATCH] [mediawiki] fix OpenSearch: can have empty description --- modules/mediawiki.py | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/modules/mediawiki.py b/modules/mediawiki.py index 08d2a19..630afdb 100644 --- a/modules/mediawiki.py +++ b/modules/mediawiki.py @@ -70,7 +70,7 @@ def opensearch(site, term, ssl=False): if response is not None and response.hasNode("Section"): for itm in response.getNode("Section").getNodes("Item"): yield (itm.getNode("Text").getContent(), - itm.getNode("Description").getContent(), + itm.getNode("Description").getContent() if itm.hasNode("Description") else "", itm.getNode("Url").getContent()) @@ -163,14 +163,16 @@ def mediawiki_response(site, term, receivers): line_treat=lambda line: irc_format(parse_wikitext(site, line, ns)), channel=receivers) except: - # Try looking at opensearch - os = [x for x, _, _ in opensearch(site, terms[0])] - # Fallback to global search - if not len(os): - os = [x for x, _ in search(site, terms[0]) if x is not None and x != ""] - return Response(os, - channel=receivers, - title="Article not found, would you mean") + pass + + # Try looking at opensearch + os = [x for x, _, _ in opensearch(site, terms[0])] + # Fallback to global search + if not len(os): + os = [x for x, _ in search(site, terms[0]) if x is not None and x != ""] + return Response(os, + channel=receivers, + title="Article not found, would you mean") @hook("cmd_hook", "mediawiki")