(original) (raw)

changeset: 103792:f8c11b61cfb7 user: Berker Peksag berker.peksag@gmail.com date: Wed Sep 14 10:59:27 2016 +0300 files: Tools/scripts/google.py description: Issue #26830: Refactor Tools/scripts/google.py Patch by Francisco Couzo. diff -r 3ce29b2452f0 -r f8c11b61cfb7 Tools/scripts/google.py --- a/Tools/scripts/google.py Tue Sep 13 22:55:19 2016 -0700 +++ b/Tools/scripts/google.py Wed Sep 14 10:59:27 2016 +0300 @@ -1,23 +1,25 @@ #! /usr/bin/env python3 -import sys, webbrowser +"""Script to search with Google + +Usage: + python3 google.py [search terms] +""" -def main(): - args = sys.argv[1:] - if not args: - print("Usage: %s querystring" % sys.argv[0]) - return - list = [] - for arg in args: - if '+' in arg: - arg = arg.replace('+', '%2B') +import sys +import urllib.parse +import webbrowser + + +def main(args): + def quote(arg): if ' ' in arg: arg = '"%s"' % arg - arg = arg.replace(' ', '+') - list.append(arg) - s = '+'.join(list) - url = "http://www.google.com/search?q=%s" % s + return urllib.parse.quote_plus(arg) + + qstring = '+'.join(quote(arg) for arg in args) + url = urllib.parse.urljoin('https://www.google.com/search', '?q=' + qstring) webbrowser.open(url) if __name__ == '__main__': - main() + main(sys.argv[1:]) /berker.peksag@gmail.com