[Python-checkins] cpython (merge 3.5 -> default): merge 3.5 (#25145)

[benjamin.peterson]

https://hg.python.org/cpython/rev/54ea36ce6eab
changeset:   98088:54ea36ce6eab
parent:      98082:5e341ec3248f
parent:      98087:7f76c7d853be
user:        Benjamin Peterson <benjamin at python.org>
date:        Sun Sep 20 23:18:58 2015 +0500
summary:
  merge 3.5 (#25145)

files:
  Doc/howto/urllib2.rst |  5 ++---
  1 files changed, 2 insertions(+), 3 deletions(-)


diff --git a/Doc/howto/urllib2.rst b/Doc/howto/urllib2.rst
--- a/Doc/howto/urllib2.rst
+++ b/Doc/howto/urllib2.rst
@@ -174,7 +174,7 @@
     import urllib.request
 
     url = 'http://www.someserver.com/cgi-bin/register.cgi'
-    user_agent = 'Mozilla/4.0 (compatible; MSIE 5.5; Windows NT)'
+    user_agent = 'Mozilla/5.0 (Windows NT 6.1; Win64; x64)'
     values = {'name' : 'Michael Foord',
               'location' : 'Northampton',
               'language' : 'Python' }
@@ -572,8 +572,7 @@
 
 This document was reviewed and revised by John Lee.
 
-.. [#] Like Google for example. The *proper* way to use google from a program
-       is to use `PyGoogle <http://pygoogle.sourceforge.net>`_ of course.
+.. [#] Google for example.
 .. [#] Browser sniffing is a very bad practise for website design - building
        sites using web standards is much more sensible. Unfortunately a lot of
        sites still send different versions to different browsers.

-- 
Repository URL: https://hg.python.org/cpython