From b306aa93b79db0d66585a409f4056057fa780c0d Mon Sep 17 00:00:00 2001
From: mrshu <mrshux@gmail.com>
Date: Wed, 15 Aug 2012 19:40:59 +0300
Subject: [PATCH 1/2] Added meanings option
This commit adds ability to query just for meanings of queries.
Example:
http://api.duckduckgo.com/?q=apple&format=json&pretty=1&d=0
vs.
http://api.duckduckgo.com/?q=apple&format=json&pretty=1&d=1
---
duckduckgo.py | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/duckduckgo.py b/duckduckgo.py
index 2761216..3ba247a 100755
--- a/duckduckgo.py
+++ b/duckduckgo.py
@@ -6,7 +6,7 @@
__version__ = 0.2
-def query(query, useragent='python-duckduckgo '+str(__version__), safesearch=True, html=False, **kwargs):
+def query(query, useragent='python-duckduckgo '+str(__version__), safesearch=True, html=False, meanings=True, **kwargs):
"""
Query DuckDuckGo, returning a Results object.
@@ -24,17 +24,20 @@ def query(query, useragent='python-duckduckgo '+str(__version__), safesearch=Tru
useragent: UserAgent to use while querying. Default: "python-duckduckgo %d" (str)
safesearch: True for on, False for off. Default: True (bool)
html: True to allow HTML in output. Default: False (bool)
+ meanings: True to include disambiguations in results (bool)
Any other keyword arguments are passed directly to DuckDuckGo as URL params.
""" % __version__
safesearch = '1' if safesearch else '-1'
html = '0' if html else '1'
+ meanings = '1' if meanings else '0'
params = {
'q': query,
'o': 'json',
'kp': safesearch,
'no_redirect': '1',
'no_html': html,
+ 'd': meanings,
}
params.update(kwargs)
encparams = urllib.urlencode(params)
From f75d7deffbf77c763fe0d1cb2b1a34fe6238af2f Mon Sep 17 00:00:00 2001
From: mrshu <mrshux@gmail.com>
Date: Wed, 15 Aug 2012 19:42:51 +0300
Subject: [PATCH 2/2] Wrong number ...
---
duckduckgo.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/duckduckgo.py b/duckduckgo.py
index 3ba247a..9cbb7f2 100755
--- a/duckduckgo.py
+++ b/duckduckgo.py
@@ -30,7 +30,7 @@ def query(query, useragent='python-duckduckgo '+str(__version__), safesearch=Tru
safesearch = '1' if safesearch else '-1'
html = '0' if html else '1'
- meanings = '1' if meanings else '0'
+ meanings = '0' if meanings else '1'
params = {
'q': query,
'o': 'json',