diff -r 3ce29b2452f0 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 04:27:39 2016 -0300
@@ -1,23 +1,33 @@
 #! /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')
+Command line usage:
+ python google.py [search terms]
+"""
+
+import sys
+import urllib.parse
+import webbrowser
+
+
+BASE_URL = "https://www.google.com/search"
+
+
+def main(args):
+ """Open Google with search results for args.
+
+ args is an iterable of strings with search terms.
+ """
+
+ 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)
+
+ query = '+'.join(quote(arg) for arg in args)
+ url = urllib.parse.urljoin(BASE_URL, '?q=' + query)
 webbrowser.open(url)
 
 if __name__ == '__main__':
- main()
+ main(sys.argv[1:])
</div><div class="naked_ctrl">
<form action="/index.cgi/contrast" method="get" name="gate">
<p><a href="http://altstyle.alfasado.net">AltStyle</a> によって変換されたページ <a href="https://bugs.python.org/file44652/scripts_google_v3.patch">(-&gt;オリジナル)</a>
/ <label>アドレス: <input type="text" name="naked_post_url" value="https://bugs.python.org/file44652/scripts_google_v3.patch" size="22" /></label> <label>モード: <select name="naked_post_mode">
<option value="default">デフォルト</option>
<option value="speech">音声ブラウザ</option>
<option value="ruby">ルビ付き</option>
<option value="contrast" selected="selected">配色反転</option>
<option value="larger-text">文字拡大</option>
<option value="mobile">モバイル</option>
</select>
<input type="submit" value="表示" />
</p>
</form>
</div>