Merge pull request #79 from pubs/bug/websearch_fix

Fixes websearch in Python 3 (fix #69)

pubs/commands/websearch_cmd.py

@@ -1,6 +1,6 @@
 import webbrowser
-import urllib
 
+from .. import p3
 from ..uis import get_ui
 
 
@@ -18,5 +18,5 @@ def command(conf, args):
     search_string = args.search_string
 
     url = ("https://scholar.google.fr/scholar?q=%s&lr="
-           % (urllib.quote_plus(' '.join(search_string))))
+           % (p3.quote_plus(' '.join(search_string))))
     webbrowser.open(url)

pubs/p3.py

@@ -17,6 +17,7 @@ if sys.version_info[0] == 2:
     ustr = unicode
     uchr = unichr
     from urlparse import urlparse
+    from urllib  import quote_plus
     from urllib2 import urlopen
     from httplib import HTTPConnection
     file = None
@@ -30,7 +31,7 @@ if sys.version_info[0] == 2:
 else:
     ustr = str
     uchr = chr
-    from urllib.parse import urlparse
+    from urllib.parse import urlparse, quote_plus
     from urllib.request import urlopen
     from http.client import HTTPConnection