diff options
author | ?ukasz Langa <lukasz@langa.pl> | 2017-02-10 00:20:16 -0800 |
---|---|---|
committer | ?ukasz Langa <lukasz@langa.pl> | 2017-02-10 00:20:16 -0800 |
commit | 8972587fab93cd27ac78b4eab3805f5e11164cb9 (patch) | |
tree | 3b6b18367a3054c41f3a186d60c321ef9a08ee38 /Tools/scripts/google.py | |
parent | c7a3f78cc193bfa7fc874f49ec2e0799b32da817 (diff) | |
parent | 2328d19475109a50de26fa42832a5286824b0391 (diff) | |
download | cpython-8972587fab93cd27ac78b4eab3805f5e11164cb9.tar.gz |
Merge 3.6 (fix #29519)
Diffstat (limited to 'Tools/scripts/google.py')
-rwxr-xr-x | Tools/scripts/google.py | 32 |
1 files changed, 17 insertions, 15 deletions
diff --git a/Tools/scripts/google.py b/Tools/scripts/google.py index 12152bb5f8..82fb287188 100755 --- a/Tools/scripts/google.py +++ b/Tools/scripts/google.py @@ -1,23 +1,25 @@ #! /usr/bin/env python3 -import sys, webbrowser +"""Script to search with Google -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') +Usage: + python3 google.py [search terms] +""" + +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:]) |