[search] PEP8 per #125 and unicode per #240

willie/modules/search.py

@@ -10,65 +10,71 @@
 import re
 import willie.web as web
 import json
+import time
+
 
 def google_ajax(query):
     """Search using AjaxSearch, and return its JSON."""
-    if isinstance(query, unicode):
-        query = query.encode('utf-8')
     uri = 'http://ajax.googleapis.com/ajax/services/search/web'
     args = '?v=1.0&safe=off&q=' + web.quote(query)
     bytes = web.get(uri + args)
     return json.loads(bytes)
 
+
 def google_search(query):
     results = google_ajax(query)
-    try: return results['responseData']['results'][0]['unescapedUrl']
-    except IndexError: return None
+    try:
+        return results['responseData']['results'][0]['unescapedUrl']
+    except IndexError:
+        return None
     except TypeError:
         return False
 
+
 def google_count(query):
     results = google_ajax(query)
-    if not results.has_key('responseData'): return '0'
-    if not results['responseData'].has_key('cursor'): return '0'
-    if not results['responseData']['cursor'].has_key('estimatedResultCount'):
+    if not 'responseData' in results:
+        return '0'
+    if not 'cursor' in results['responseData']:
+        return '0'
+    if not 'estimatedResultCount' in results['responseData']['cursor']:
         return '0'
     return results['responseData']['cursor']['estimatedResultCount']
 
+
 def formatnumber(n):
     """Format a number with beautiful commas."""
     parts = list(str(n))
     for i in range((len(parts) - 3), 0, -3):
         parts.insert(i, ',')
     return ''.join(parts)
 
+
 def g(willie, trigger):
     """Queries Google for the specified input."""
     query = trigger.group(2)
     if not query:
         return willie.reply('.g what?')
-    try:
-        query = query.encode('utf-8')
-    except:
-        pass
     uri = google_search(query)
     if uri:
         willie.reply(uri)
         if not hasattr(willie.bot, 'last_seen_uri'):
             willie.bot.last_seen_uri = {}
         willie.bot.last_seen_uri[trigger.sender] = uri
-    elif uri is False: willie.reply("Problem getting data from Google.")
-    else: willie.reply("No results found for '%s'." % query)
-g.commands = ['g','google']
+    elif uri is False:
+        willie.reply("Problem getting data from Google.")
+    else:
+        willie.reply("No results found for '%s'." % query)
+g.commands = ['g', 'google']
 g.priority = 'high'
 g.example = '.g swhack'
 
+
 def gc(willie, trigger):
     """Returns the number of Google results for the specified input."""
     query = trigger.group(2)
     if not query:
         return willie.reply('.gc what?')
-    query = query.encode('utf-8')
     num = formatnumber(google_count(query))
     willie.say(query + ': ' + num)
 gc.commands = ['gc']
@@ -79,6 +85,7 @@ def gc(willie, trigger):
     r'\+?"[^"\\]*(?:\\.[^"\\]*)*"|\[[^]\\]*(?:\\.[^]\\]*)*\]|\S+'
 )
 
+
 def gcs(willie, trigger):
     """Compare the number of Google search results"""
     if not trigger.group(2):
@@ -90,11 +97,12 @@ def gcs(willie, trigger):
     results = []
     for i, query in enumerate(queries):
         query = query.strip('[]')
-        query = query.encode('utf-8')
         n = int((formatnumber(google_count(query)) or '0').replace(',', ''))
         results.append((n, query))
-        if i >= 2: __import__('time').sleep(0.25)
-        if i >= 4: __import__('time').sleep(0.25)
+        if i >= 2:
+            time.sleep(0.25)
+        if i >= 4:
+            time.sleep(0.25)
 
     results = [(term, n) for (n, term) in reversed(sorted(results))]
     reply = ', '.join('%s (%s)' % (t, formatnumber(n)) for (t, n) in results)
@@ -104,86 +112,95 @@ def gcs(willie, trigger):
 
 r_bing = re.compile(r'<h3><a href="([^"]+)"')
 
+
 def bing_search(query, lang='en-GB'):
     query = web.quote(query)
     base = 'http://www.bing.com/search?mkt=%s&q=' % lang
     bytes = web.get(base + query)
     m = r_bing.search(bytes)
-    if m: return m.group(1)
+    if m:
+        return m.group(1)
+
 
 def bing(willie, trigger):
     """Queries Bing for the specified input."""
     query = trigger.group(2)
     if query.startswith(':'):
         lang, query = query.split(' ', 1)
         lang = lang[1:]
-    else: lang = 'en-GB'
+    else:
+        lang = 'en-GB'
     if not query:
         return willie.reply('.bing what?')
 
-    query = query.encode('utf-8')
     uri = bing_search(query, lang)
     if uri:
         willie.reply(uri)
         if not hasattr(willie.bot, 'last_seen_uri'):
             willie.bot.last_seen_uri = {}
         willie.bot.last_seen_uri[trigger.sender] = uri
-    else: willie.reply("No results found for '%s'." % query)
+    else:
+        willie.reply("No results found for '%s'." % query)
 bing.commands = ['bing']
 bing.example = '.bing swhack'
 
 r_duck = re.compile(r'nofollow" class="[^"]+" href="(.*?)">')
 
+
 def duck_search(query):
     query = query.replace('!', '')
     query = web.quote(query)
     uri = 'http://duckduckgo.com/html/?q=%s&kl=uk-en' % query
     bytes = web.get(uri)
     m = r_duck.search(bytes)
-    if m: return web.decode(m.group(1))
+    if m:
+        return web.decode(m.group(1))
+
 
 def duck_api(query):
     if '!bang' in query.lower():
         return 'https://duckduckgo.com/bang.html'
 
     uri = web.quote(query)
-    uri = 'http://api.duckduckgo.com/?q=%s&format=json&no_html=1&no_redirect=1'%query
+    uri = 'http://api.duckduckgo.com/?q=%s&format=json&no_html=1&no_redirect=1' % query
     results = json.loads(web.get(uri))
     print results
     if results['Redirect']:
         return results['Redirect']
     else:
         return None
 
+
 def duck(willie, trigger):
     """Queries Duck Duck Go for the specified input."""
     query = trigger.group(2)
     if not query:
         return willie.reply('.ddg what?')
-    query = query.encode('utf-8')
-
+
     #If the API gives us something, say it and stop
     result = duck_api(query)
     if result:
         willie.reply(result)
         return
-    
+
     #Otherwise, look it up on the HTMl version
-    uri= duck_search(query)
-    
+    uri = duck_search(query)
+
     if uri:
         willie.reply(uri)
         if not hasattr(willie.bot, 'last_seen_uri'):
             willie.bot.last_seen_uri = {}
         willie.bot.last_seen_uri[trigger.sender] = uri
-    else: willie.reply("No results found for '%s'." % query)
+    else:
+        willie.reply("No results found for '%s'." % query)
 duck.commands = ['duck', 'ddg']
 
+
 def search(willie, trigger):
     """Searches Google, Bing, and Duck Duck Go."""
     if not trigger.group(2):
         return willie.reply('.search for what?')
-    query = trigger.group(2).encode('utf-8')
+    query = trigger.group(2)
     gu = google_search(query) or '-'
     bu = bing_search(query) or '-'
     du = duck_search(query) or '-'
@@ -197,25 +214,30 @@ def search(willie, trigger):
     elif (gu == du):
         result = '%s (g, d), %s (b)' % (gu, bu)
     else:
-        if len(gu) > 250: gu = '(extremely long link)'
-        if len(bu) > 150: bu = '(extremely long link)'
-        if len(du) > 150: du = '(extremely long link)'
+        if len(gu) > 250:
+            gu = '(extremely long link)'
+        if len(bu) > 150:
+            bu = '(extremely long link)'
+        if len(du) > 150:
+            du = '(extremely long link)'
         result = '%s (g), %s (b), %s (d)' % (gu, bu, du)
 
     willie.reply(result)
 search.commands = ['search']
 search.example = '.search nerdfighter'
 
+
 def suggest(willie, trigger):
     """Suggest terms starting with given input"""
     if not trigger.group(2):
         return willie.reply("No query term.")
-    query = trigger.group(2).encode('utf-8')
+    query = trigger.group(2)
     uri = 'http://websitedev.de/temp-bin/suggest.pl?q='
     answer = web.get(uri + web.quote(query).replace('+', '%2B'))
     if answer:
         willie.say(answer)
-    else: willie.reply('Sorry, no result.')
+    else:
+        willie.reply('Sorry, no result.')
 suggest.commands = ['suggest']
 
 if __name__ == '__main__':