Mikaela
/
Limnoria
mirror of https://github.com/Mikaela/Limnoria.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

DDG/FML/Isup: work towards PEP8 compliancy 

Skipping the config options in config.py since the indented version
looks just as bad (not enough space to write the text without making
it use 5 lines).

From: 4a62b4ad13
This commit is contained in:
James Lu 2014-12-27 11:37:16 -08:00
parent 7ecd98f29c
commit 94c582a4a0
3 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
config.py
View File

@ -36,7 +36,8 @@ try:
except: except:
# Placeholder that allows to run the plugin on a bot # Placeholder that allows to run the plugin on a bot
# without the i18n module # without the i18n module
_ = lambda x:x _ = lambda x: x
def configure(advanced): def configure(advanced):
# This will be called by supybot to configure this module. advanced is # This will be called by supybot to configure this module. advanced is

17
plugin.py
View File

@ -39,18 +39,20 @@ try:
except ImportError: except ImportError:
# Placeholder that allows to run the plugin on a bot # Placeholder that allows to run the plugin on a bot
# without the i18n module # without the i18n module
_ = lambda x:x _ = lambda x: x
try: # Python 3
try: # Python 3
from urllib.parse import urlencode from urllib.parse import urlencode
except ImportError: # Python 2 except ImportError: # Python 2
from urllib import urlencode from urllib import urlencode
try: try:
from bs4 import BeautifulSoup from bs4 import BeautifulSoup
except ImportError: except ImportError:
raise ImportError("Beautiful Soup 4 is required for this plugin: get it" raise ImportError("Beautiful Soup 4 is required for this plugin: get it"
" at http://www.crummy.com/software/BeautifulSoup/bs4/doc/" " at http://www.crummy.com/software/BeautifulSoup/bs4"
"#installing-beautiful-soup") "/doc/#installing-beautiful-soup")
class DDG(callbacks.Plugin): class DDG(callbacks.Plugin):
"""Searches for results on DuckDuckGo.""" """Searches for results on DuckDuckGo."""
@ -60,7 +62,7 @@ class DDG(callbacks.Plugin):
"""<query> """<query>
Searches for <query> on DuckDuckGo (web search).""" Searches for <query> on DuckDuckGo (web search)."""
url = "https://duckduckgo.com/lite?" + urlencode({"q":text}) url = "https://duckduckgo.com/lite?" + urlencode({"q": text})
try: try:
data = utils.web.getUrl(url).decode("utf-8") data = utils.web.getUrl(url).decode("utf-8")
except utils.web.Error as e: except utils.web.Error as e:
@ -75,7 +77,8 @@ class DDG(callbacks.Plugin):
continue continue
try: try:
# 1) Get a result snippet. # 1) Get a result snippet.
snippet = res.parent.next_sibling.next_sibling.find_all("td")[-1] snippet = res.parent.next_sibling.next_sibling.\
find_all("td")[-1]
# 2) Fetch the result link. # 2) Fetch the result link.
link = res.a.get('href') link = res.a.get('href')
snippet = snippet.text.strip() snippet = snippet.text.strip()

4
test.py
View File

@ -30,11 +30,13 @@
from supybot.test import * from supybot.test import *
class DDGTestCase(PluginTestCase): class DDGTestCase(PluginTestCase):
plugins = ('DDG',) plugins = ('DDG',)
def testSearch(self): def testSearch(self):
self.assertRegexp('ddg search wikipedia', 'Wikipedia.*? - .*?https?\:\/\/') self.assertRegexp(
'ddg search wikipedia', 'Wikipedia.*? - .*?https?\:\/\/')
# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79: # vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79: