use six to support python 2 and 3

ox/web/wikipedia.py

@@ -1,11 +1,14 @@
 # -*- coding: utf-8 -*-
 # vi:si:et:sw=4:sts=4:ts=4
+from __future__ import print_function
+
 import re
-from urllib import urlencode
+
+from six.moves import urllib
 
 from ox.utils import json
 from ox.cache import read_url
-from ox import find_re, decode_html
+from ox import find_re
 
 
 def get_id(url):
@@ -138,11 +141,11 @@ def get_allmovie_id(wikipedia_url):
 def find(query, max_results=10):
     query = {'action': 'query', 'list':'search', 'format': 'json',
              'srlimit': max_results, 'srwhat': 'text', 'srsearch': query.encode('utf-8')}
-    url = "http://en.wikipedia.org/w/api.php?" + urlencode(query)
+    url = "http://en.wikipedia.org/w/api.php?" + urllib.parse.urlencode(query)
     data = read_url(url)
     if not data:
         data  = read_url(url, timeout=0)
-    result = json.loads(data)
+    result = json.loads(data.decode('utf-8'))
     results = []
     if result and 'query' in result:
         for r in result['query']['search']: